diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
index 143766a9eabe..9fb6b4e8acaa 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
@@ -42,7 +42,7 @@
         </e>
         <e>
             <k>@macro_expansion</k>
-            <v>33190741</v>
+            <v>33190944</v>
         </e>
         <e>
             <k>@other_macro_reference</k>
@@ -370,7 +370,7 @@
         </e>
         <e>
             <k>@usertype</k>
-            <v>5224397</v>
+            <v>5225328</v>
         </e>
         <e>
             <k>@mangledname</k>
@@ -966,7 +966,7 @@
         </e>
         <e>
             <k>@static_cast</k>
-            <v>215214</v>
+            <v>215215</v>
         </e>
         <e>
             <k>@reinterpret_cast</k>
@@ -990,7 +990,7 @@
         </e>
         <e>
             <k>@noopexpr</k>
-            <v>88</v>
+            <v>76</v>
         </e>
         <e>
             <k>@istriviallyconstructibleexpr</k>
@@ -1374,7 +1374,7 @@
         </e>
         <e>
             <k>@concept_id</k>
-            <v>2</v>
+            <v>9</v>
         </e>
         <e>
             <k>@lambdacapture</k>
@@ -1430,7 +1430,7 @@
         </e>
         <e>
             <k>@stmt_decl</k>
-            <v>591926</v>
+            <v>591930</v>
         </e>
         <e>
             <k>@stmt_empty</k>
@@ -2216,7 +2216,7 @@
                 </e>
                 <e>
                     <k>seconds</k>
-                    <v>10028</v>
+                    <v>9988</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2297,17 +2297,22 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>639</v>
+                                    <v>719</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>359</v>
+                                    <v>279</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>119</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
                                     <b>9</b>
-                                    <v>159</v>
+                                    <v>119</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -2316,28 +2321,28 @@
                                 </b>
                                 <b>
                                     <a>10</a>
-                                    <b>11</b>
+                                    <b>12</b>
                                     <v>159</v>
                                 </b>
                                 <b>
-                                    <a>11</a>
-                                    <b>13</b>
+                                    <a>12</a>
+                                    <b>17</b>
                                     <v>159</v>
                                 </b>
                                 <b>
-                                    <a>16</a>
-                                    <b>17</b>
+                                    <a>17</a>
+                                    <b>20</b>
                                     <v>159</v>
                                 </b>
                                 <b>
-                                    <a>19</a>
-                                    <b>22</b>
+                                    <a>21</a>
+                                    <b>52</b>
                                     <v>159</v>
                                 </b>
                                 <b>
-                                    <a>42</a>
-                                    <b>93</b>
-                                    <v>119</v>
+                                    <a>86</a>
+                                    <b>87</b>
+                                    <v>39</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2405,22 +2410,22 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1318</v>
+                                    <v>1398</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>479</v>
+                                    <v>359</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>279</v>
+                                    <v>239</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>239</v>
+                                    <v>359</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -2430,16 +2435,16 @@
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>279</v>
+                                    <v>239</v>
                                 </b>
                                 <b>
                                     <a>9</a>
-                                    <b>24</b>
+                                    <b>23</b>
                                     <v>279</v>
                                 </b>
                                 <b>
                                     <a>24</a>
-                                    <b>91</b>
+                                    <b>94</b>
                                     <v>279</v>
                                 </b>
                             </bs>
@@ -2488,21 +2493,16 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>39</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>39</v>
+                                    <v>79</v>
                                 </b>
                                 <b>
-                                    <a>134</a>
-                                    <b>135</b>
+                                    <a>139</a>
+                                    <b>140</b>
                                     <v>39</v>
                                 </b>
                                 <b>
-                                    <a>137</a>
-                                    <b>138</b>
+                                    <a>148</a>
+                                    <b>149</b>
                                     <v>39</v>
                                 </b>
                             </bs>
@@ -2519,27 +2519,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5593</v>
+                                    <v>5433</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2197</v>
+                                    <v>2237</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1078</v>
+                                    <v>1238</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>5</b>
-                                    <v>559</v>
+                                    <b>6</b>
+                                    <v>879</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>50</b>
-                                    <v>599</v>
+                                    <a>6</a>
+                                    <b>46</b>
+                                    <v>199</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2555,32 +2555,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4914</v>
+                                    <v>4634</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1797</v>
+                                    <v>1917</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1518</v>
+                                    <v>1558</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>759</v>
+                                    <v>839</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>8</b>
-                                    <v>759</v>
+                                    <b>7</b>
+                                    <v>799</v>
                                 </b>
                                 <b>
-                                    <a>8</a>
-                                    <b>76</b>
-                                    <v>279</v>
+                                    <a>10</a>
+                                    <b>73</b>
+                                    <v>239</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2596,12 +2596,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8949</v>
+                                    <v>8270</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1078</v>
+                                    <v>1718</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2945,7 +2945,7 @@
                 </e>
                 <e>
                     <k>cpu_seconds</k>
-                    <v>7221</v>
+                    <v>7052</v>
                 </e>
                 <e>
                     <k>elapsed_seconds</k>
@@ -2995,17 +2995,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5824</v>
+                                    <v>5576</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>923</v>
+                                    <v>1013</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>12</b>
-                                    <v>473</v>
+                                    <b>15</b>
+                                    <v>461</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3021,12 +3021,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6500</v>
+                                    <v>6354</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>721</v>
+                                    <v>698</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3039,24 +3039,14 @@
                         <hist>
                             <budget>12</budget>
                             <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>11</v>
-                                </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>11</v>
+                                    <v>33</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>5</b>
+                                    <a>5</a>
+                                    <b>6</b>
                                     <v>11</v>
                                 </b>
                                 <b>
@@ -3064,34 +3054,34 @@
                                     <b>10</b>
                                     <v>11</v>
                                 </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>11</v>
-                                </b>
                                 <b>
                                     <a>12</a>
                                     <b>13</b>
+                                    <v>22</v>
+                                </b>
+                                <b>
+                                    <a>50</a>
+                                    <b>51</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>51</a>
-                                    <b>52</b>
+                                    <a>170</a>
+                                    <b>171</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>178</a>
-                                    <b>179</b>
-                                    <v>22</v>
+                                    <a>172</a>
+                                    <b>173</b>
+                                    <v>11</v>
                                 </b>
                                 <b>
-                                    <a>183</a>
-                                    <b>184</b>
+                                    <a>174</a>
+                                    <b>175</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>232</a>
-                                    <b>233</b>
+                                    <a>253</a>
+                                    <b>254</b>
                                     <v>11</v>
                                 </b>
                             </bs>
@@ -3105,24 +3095,14 @@
                         <hist>
                             <budget>12</budget>
                             <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>11</v>
-                                </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>11</v>
+                                    <v>33</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>5</b>
+                                    <a>5</a>
+                                    <b>6</b>
                                     <v>11</v>
                                 </b>
                                 <b>
@@ -3130,39 +3110,34 @@
                                     <b>10</b>
                                     <v>11</v>
                                 </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>11</v>
-                                </b>
                                 <b>
                                     <a>12</a>
                                     <b>13</b>
-                                    <v>11</v>
+                                    <v>22</v>
                                 </b>
                                 <b>
-                                    <a>49</a>
-                                    <b>50</b>
+                                    <a>48</a>
+                                    <b>49</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>128</a>
-                                    <b>129</b>
+                                    <a>119</a>
+                                    <b>120</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>131</a>
-                                    <b>132</b>
+                                    <a>121</a>
+                                    <b>122</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>146</a>
-                                    <b>147</b>
+                                    <a>134</a>
+                                    <b>135</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>210</a>
-                                    <b>211</b>
+                                    <a>222</a>
+                                    <b>223</b>
                                     <v>11</v>
                                 </b>
                             </bs>
@@ -11858,7 +11833,7 @@
         </relation>
         <relation>
             <name>fileannotations</name>
-            <cardinality>5119099</cardinality>
+            <cardinality>5119131</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -12343,7 +12318,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>45942</v>
+                                    <v>45943</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12700,19 +12675,19 @@
         </relation>
         <relation>
             <name>macroinvocations</name>
-            <cardinality>33423519</cardinality>
+            <cardinality>33423724</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>33423519</v>
+                    <v>33423724</v>
                 </e>
                 <e>
                     <k>macro_id</k>
-                    <v>79323</v>
+                    <v>79324</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>758854</v>
+                    <v>758859</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -12730,7 +12705,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33423519</v>
+                                    <v>33423724</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12746,7 +12721,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33423519</v>
+                                    <v>33423724</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12762,7 +12737,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33423519</v>
+                                    <v>33423724</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12849,7 +12824,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10375</v>
+                                    <v>10376</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -12890,7 +12865,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73600</v>
+                                    <v>73601</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12911,17 +12886,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>280658</v>
+                                    <v>280660</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>169316</v>
+                                    <v>169317</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>70592</v>
+                                    <v>70593</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -12936,12 +12911,12 @@
                                 <b>
                                     <a>8</a>
                                     <b>17</b>
-                                    <v>62762</v>
+                                    <v>62763</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>525</b>
-                                    <v>56915</v>
+                                    <v>56916</v>
                                 </b>
                                 <b>
                                     <a>534</a>
@@ -12962,12 +12937,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>712777</v>
+                                    <v>712781</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>350</b>
-                                    <v>46077</v>
+                                    <v>46078</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12983,7 +12958,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>758854</v>
+                                    <v>758859</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13056,15 +13031,15 @@
         </relation>
         <relation>
             <name>macroparent</name>
-            <cardinality>29890367</cardinality>
+            <cardinality>29890550</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>29890367</v>
+                    <v>29890550</v>
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>23240072</v>
+                    <v>23240214</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13078,7 +13053,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29890367</v>
+                                    <v>29890550</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13094,17 +13069,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17956533</v>
+                                    <v>17956643</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4450564</v>
+                                    <v>4450591</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>88</b>
-                                    <v>832973</v>
+                                    <v>832979</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13192,11 +13167,11 @@
         </relation>
         <relation>
             <name>macro_argument_unexpanded</name>
-            <cardinality>84379058</cardinality>
+            <cardinality>84379575</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>26161931</v>
+                    <v>26162091</v>
                 </e>
                 <e>
                     <k>argument_index</k>
@@ -13204,7 +13179,7 @@
                 </e>
                 <e>
                     <k>text</k>
-                    <v>317667</v>
+                    <v>317669</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13218,22 +13193,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7417487</v>
+                                    <v>7417532</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10652518</v>
+                                    <v>10652583</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6126955</v>
+                                    <v>6126993</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1964970</v>
+                                    <v>1964982</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13249,22 +13224,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7487505</v>
+                                    <v>7487551</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10798773</v>
+                                    <v>10798839</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5960962</v>
+                                    <v>5960999</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1914689</v>
+                                    <v>1914701</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13352,7 +13327,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>23883</v>
+                                    <v>23884</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -13362,7 +13337,7 @@
                                 <b>
                                     <a>12</a>
                                     <b>16</b>
-                                    <v>21472</v>
+                                    <v>21473</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -13398,12 +13373,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>229736</v>
+                                    <v>229737</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>77667</v>
+                                    <v>77668</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -13418,11 +13393,11 @@
         </relation>
         <relation>
             <name>macro_argument_expanded</name>
-            <cardinality>84379058</cardinality>
+            <cardinality>84379575</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>26161931</v>
+                    <v>26162091</v>
                 </e>
                 <e>
                     <k>argument_index</k>
@@ -13430,7 +13405,7 @@
                 </e>
                 <e>
                     <k>text</k>
-                    <v>192513</v>
+                    <v>192514</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13444,22 +13419,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7417487</v>
+                                    <v>7417532</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10652518</v>
+                                    <v>10652583</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6126955</v>
+                                    <v>6126993</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1964970</v>
+                                    <v>1964982</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13475,22 +13450,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10667253</v>
+                                    <v>10667319</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9183319</v>
+                                    <v>9183375</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5197781</v>
+                                    <v>5197813</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>1113576</v>
+                                    <v>1113582</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13558,7 +13533,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20751</v>
+                                    <v>20752</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13634,7 +13609,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>80709</v>
+                                    <v>80710</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -15357,6 +15332,132 @@
                 </dep>
             </dependencies>
         </relation>
+        <relation>
+            <name>fun_requires</name>
+            <cardinality>4</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>3</v>
+                </e>
+                <e>
+                    <k>kind</k>
+                    <v>2</v>
+                </e>
+                <e>
+                    <k>constraint</k>
+                    <v>4</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>constraint</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>kind</src>
+                    <trg>constraint</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>2</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>constraint</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>constraint</src>
+                    <trg>kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
         <relation>
             <name>param_decl_bind</name>
             <cardinality>6974708</cardinality>
@@ -16322,6 +16423,54 @@
             </columnsizes>
             <dependencies/>
         </relation>
+        <relation>
+            <name>var_requires</name>
+            <cardinality>1</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>1</v>
+                </e>
+                <e>
+                    <k>constraint</k>
+                    <v>1</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>constraint</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>constraint</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
         <relation>
             <name>type_decls</name>
             <cardinality>3279504</cardinality>
@@ -16480,6 +16629,54 @@
             </columnsizes>
             <dependencies/>
         </relation>
+        <relation>
+            <name>type_requires</name>
+            <cardinality>1</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>1</v>
+                </e>
+                <e>
+                    <k>constraint</k>
+                    <v>1</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>constraint</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>constraint</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
         <relation>
             <name>namespace_decls</name>
             <cardinality>311433</cardinality>
@@ -17129,7 +17326,7 @@
         </relation>
         <relation>
             <name>using_container</name>
-            <cardinality>465860</cardinality>
+            <cardinality>465863</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
@@ -17137,7 +17334,7 @@
                 </e>
                 <e>
                     <k>child</k>
-                    <v>295394</v>
+                    <v>295396</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17207,12 +17404,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>217873</v>
+                                    <v>217874</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>51620</v>
+                                    <v>51621</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -18358,7 +18555,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>119726</v>
+                                    <v>119727</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18829,7 +19026,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5359</v>
+                                    <v>5364</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -18839,7 +19036,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>3379</v>
+                                    <v>3374</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -18865,7 +19062,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26894</v>
+                                    <v>26899</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18875,7 +19072,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>2917</v>
+                                    <v>2912</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -21495,15 +21692,15 @@
         </relation>
         <relation>
             <name>typedefbase</name>
-            <cardinality>1682711</cardinality>
+            <cardinality>1682722</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1682711</v>
+                    <v>1682722</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>791886</v>
+                    <v>791891</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21517,7 +21714,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1682711</v>
+                                    <v>1682722</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21533,17 +21730,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>616159</v>
+                                    <v>616163</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>83086</v>
+                                    <v>83087</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>61906</v>
+                                    <v>61907</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -21844,11 +22041,11 @@
         </relation>
         <relation>
             <name>usertypes</name>
-            <cardinality>5224397</cardinality>
+            <cardinality>5225328</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5224397</v>
+                    <v>5225328</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -21870,7 +22067,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5224397</v>
+                                    <v>5225328</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21886,7 +22083,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5224397</v>
+                                    <v>5225328</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21943,12 +22140,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>125221</v>
+                                    <v>124756</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>14896</v>
+                                    <v>15361</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21982,8 +22179,8 @@
                                     <v>465</v>
                                 </b>
                                 <b>
-                                    <a>133</a>
-                                    <b>134</b>
+                                    <a>135</a>
+                                    <b>136</b>
                                     <v>465</v>
                                 </b>
                                 <b>
@@ -22048,8 +22245,8 @@
                                     <v>465</v>
                                 </b>
                                 <b>
-                                    <a>41</a>
-                                    <b>42</b>
+                                    <a>43</a>
+                                    <b>44</b>
                                     <v>465</v>
                                 </b>
                                 <b>
@@ -22090,11 +22287,11 @@
         </relation>
         <relation>
             <name>usertypesize</name>
-            <cardinality>1701432</cardinality>
+            <cardinality>1702363</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1701432</v>
+                    <v>1702363</v>
                 </e>
                 <e>
                     <k>size</k>
@@ -22116,7 +22313,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1701432</v>
+                                    <v>1702363</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22132,7 +22329,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1701432</v>
+                                    <v>1702363</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22187,7 +22384,7 @@
                                 </b>
                                 <b>
                                     <a>740</a>
-                                    <b>2470</b>
+                                    <b>2472</b>
                                     <v>931</v>
                                 </b>
                             </bs>
@@ -22248,8 +22445,8 @@
                                     <v>465</v>
                                 </b>
                                 <b>
-                                    <a>3209</a>
-                                    <b>3210</b>
+                                    <a>3211</a>
+                                    <b>3212</b>
                                     <v>465</v>
                                 </b>
                             </bs>
@@ -22369,13 +22566,66 @@
             </columnsizes>
             <dependencies/>
         </relation>
+        <relation>
+            <name>type_template_type_constraint</name>
+            <cardinality>3</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>2</v>
+                </e>
+                <e>
+                    <k>constraint</k>
+                    <v>3</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>constraint</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>constraint</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
         <relation>
             <name>mangled_name</name>
-            <cardinality>8993151</cardinality>
+            <cardinality>8994082</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>8993151</v>
+                    <v>8994082</v>
                 </e>
                 <e>
                     <k>mangled_name</k>
@@ -22397,7 +22647,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8993151</v>
+                                    <v>8994082</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22413,7 +22663,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8993151</v>
+                                    <v>8994082</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22464,8 +22714,8 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>19319</a>
-                                    <b>19320</b>
+                                    <a>19321</a>
+                                    <b>19322</b>
                                     <v>465</v>
                                 </b>
                             </bs>
@@ -22492,33 +22742,33 @@
         </relation>
         <relation>
             <name>is_pod_class</name>
-            <cardinality>533636</cardinality>
+            <cardinality>533639</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>533636</v>
+                    <v>533639</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_standard_layout_class</name>
-            <cardinality>1250354</cardinality>
+            <cardinality>1251285</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1250354</v>
+                    <v>1251285</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_complete</name>
-            <cardinality>1640916</cardinality>
+            <cardinality>1641847</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1640916</v>
+                    <v>1641847</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -22624,11 +22874,11 @@
         </relation>
         <relation>
             <name>class_template_argument</name>
-            <cardinality>2882664</cardinality>
+            <cardinality>2882682</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>1313006</v>
+                    <v>1313014</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -22636,7 +22886,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>840961</v>
+                    <v>840966</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22650,17 +22900,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>537771</v>
+                                    <v>537774</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>399176</v>
+                                    <v>399179</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>230806</v>
+                                    <v>230807</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -22686,17 +22936,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>564325</v>
+                                    <v>564328</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>410397</v>
+                                    <v>410400</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>244370</v>
+                                    <v>244372</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -22809,12 +23059,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>523868</v>
+                                    <v>523872</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>174408</v>
+                                    <v>174409</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -22829,7 +23079,7 @@
                                 <b>
                                     <a>10</a>
                                     <b>10265</b>
-                                    <v>27353</v>
+                                    <v>27354</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22845,7 +23095,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>747070</v>
+                                    <v>747075</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23036,15 +23286,15 @@
         </relation>
         <relation>
             <name>is_proxy_class_for</name>
-            <cardinality>61912</cardinality>
+            <cardinality>62843</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>61912</v>
+                    <v>62843</v>
                 </e>
                 <e>
                     <k>templ_param_id</k>
-                    <v>61912</v>
+                    <v>62843</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23058,7 +23308,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>61912</v>
+                                    <v>62843</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23074,7 +23324,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>61912</v>
+                                    <v>62843</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24888,15 +25138,15 @@
         </relation>
         <relation>
             <name>concept_instantiation</name>
-            <cardinality>2</cardinality>
+            <cardinality>9</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>2</v>
+                    <v>9</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>1</v>
+                    <v>2</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24910,7 +25160,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2</v>
+                                    <v>9</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24928,6 +25178,11 @@
                                     <b>3</b>
                                     <v>1</v>
                                 </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>1</v>
+                                </b>
                             </bs>
                         </hist>
                     </val>
@@ -24936,22 +25191,22 @@
         </relation>
         <relation>
             <name>is_type_constraint</name>
-            <cardinality>1</cardinality>
+            <cardinality>3</cardinality>
             <columnsizes>
                 <e>
                     <k>concept_id</k>
-                    <v>1</v>
+                    <v>3</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>concept_template_argument</name>
-            <cardinality>8</cardinality>
+            <cardinality>20</cardinality>
             <columnsizes>
                 <e>
                     <k>concept_id</k>
-                    <v>5</v>
+                    <v>11</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -24959,7 +25214,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>6</v>
+                    <v>11</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24978,7 +25233,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3</v>
+                                    <v>9</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24994,7 +25249,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4</v>
+                                    <v>10</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25013,13 +25268,13 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>3</a>
-                                    <b>4</b>
+                                    <a>9</a>
+                                    <b>10</b>
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>6</b>
+                                    <a>11</a>
+                                    <b>12</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -25034,13 +25289,13 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>3</a>
-                                    <b>4</b>
+                                    <a>8</a>
+                                    <b>9</b>
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>6</b>
+                                    <a>10</a>
+                                    <b>11</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -25057,7 +25312,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6</v>
+                                    <v>10</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25078,7 +25338,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2</v>
+                                    <v>7</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25088,11 +25348,11 @@
         </relation>
         <relation>
             <name>concept_template_argument_value</name>
-            <cardinality>3</cardinality>
+            <cardinality>9</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>3</v>
+                    <v>9</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -25100,7 +25360,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>3</v>
+                    <v>9</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25114,7 +25374,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3</v>
+                                    <v>9</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25130,7 +25390,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3</v>
+                                    <v>9</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25144,8 +25404,8 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>3</a>
-                                    <b>4</b>
+                                    <a>9</a>
+                                    <b>10</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -25160,8 +25420,8 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>3</a>
-                                    <b>4</b>
+                                    <a>9</a>
+                                    <b>10</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -25178,7 +25438,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3</v>
+                                    <v>9</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25194,7 +25454,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3</v>
+                                    <v>9</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25747,11 +26007,11 @@
         </relation>
         <relation>
             <name>typespecifiers</name>
-            <cardinality>1128857</cardinality>
+            <cardinality>1129788</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>1110702</v>
+                    <v>1111633</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -25769,7 +26029,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1092547</v>
+                                    <v>1093478</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25815,7 +26075,12 @@
                                 <b>
                                     <a>219</a>
                                     <b>220</b>
-                                    <v>931</v>
+                                    <v>465</v>
+                                </b>
+                                <b>
+                                    <a>221</a>
+                                    <b>222</b>
+                                    <v>465</v>
                                 </b>
                                 <b>
                                     <a>1701</a>
@@ -25830,7 +26095,7 @@
         </relation>
         <relation>
             <name>funspecifiers</name>
-            <cardinality>10274695</cardinality>
+            <cardinality>10275161</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
@@ -25857,12 +26122,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>639142</v>
+                                    <v>638677</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>982222</v>
+                                    <v>982687</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -25971,8 +26236,8 @@
                                     <v>465</v>
                                 </b>
                                 <b>
-                                    <a>6434</a>
-                                    <b>6435</b>
+                                    <a>6435</a>
+                                    <b>6436</b>
                                     <v>465</v>
                                 </b>
                             </bs>
@@ -27652,15 +27917,15 @@
         </relation>
         <relation>
             <name>unspecifiedtype</name>
-            <cardinality>9466107</cardinality>
+            <cardinality>9467039</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>9466107</v>
+                    <v>9467039</v>
                 </e>
                 <e>
                     <k>unspecified_type_id</k>
-                    <v>6477080</v>
+                    <v>6478011</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27674,7 +27939,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9466107</v>
+                                    <v>9467039</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27690,7 +27955,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4551273</v>
+                                    <v>4552204</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -32896,11 +33161,11 @@
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>18321462</v>
+                    <v>18321461</v>
                 </e>
                 <e>
                     <k>typeid</k>
-                    <v>1212638</v>
+                    <v>1212645</v>
                 </e>
                 <e>
                     <k>value_category</k>
@@ -32918,12 +33183,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18190111</v>
+                                    <v>18190110</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>131350</v>
+                                    <v>131351</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32939,7 +33204,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18321462</v>
+                                    <v>18321461</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32955,17 +33220,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>437717</v>
+                                    <v>437720</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>248843</v>
+                                    <v>248844</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>102689</v>
+                                    <v>102690</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -32975,7 +33240,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>109223</v>
+                                    <v>109224</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -33006,12 +33271,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1048582</v>
+                                    <v>1048589</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>153882</v>
+                                    <v>153883</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -33040,8 +33305,8 @@
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>1242905</a>
-                                    <b>1242906</b>
+                                    <a>1242895</a>
+                                    <b>1242896</b>
                                     <v>11</v>
                                 </b>
                             </bs>
@@ -37379,7 +37644,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>580403</v>
+                                    <v>580404</v>
                                 </b>
                                 <b>
                                     <a>2</a>