diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
index 1fb8635d9e28..4f2222cb45d1 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>5225059</v>
+            <v>5225328</v>
         </e>
         <e>
             <k>@mangledname</k>
@@ -380,6 +380,10 @@
             <k>@type_mention</k>
             <v>4029456</v>
         </e>
+        <e>
+            <k>@concept_template</k>
+            <v>3</v>
+        </e>
         <e>
             <k>@routinetype</k>
             <v>532576</v>
@@ -962,7 +966,7 @@
         </e>
         <e>
             <k>@static_cast</k>
-            <v>215214</v>
+            <v>215215</v>
         </e>
         <e>
             <k>@reinterpret_cast</k>
@@ -1426,7 +1430,7 @@
         </e>
         <e>
             <k>@stmt_decl</k>
-            <v>591926</v>
+            <v>591930</v>
         </e>
         <e>
             <k>@stmt_empty</k>
@@ -2212,7 +2216,7 @@
                 </e>
                 <e>
                     <k>seconds</k>
-                    <v>9908</v>
+                    <v>9549</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2293,17 +2297,17 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>639</v>
+                                    <v>559</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>359</v>
+                                    <v>439</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>119</v>
+                                    <a>5</a>
+                                    <b>8</b>
+                                    <v>159</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -2311,35 +2315,30 @@
                                     <v>119</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
+                                    <a>9</a>
                                     <b>11</b>
                                     <v>119</v>
                                 </b>
                                 <b>
                                     <a>11</a>
-                                    <b>13</b>
+                                    <b>15</b>
                                     <v>159</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
-                                    <b>17</b>
+                                    <a>16</a>
+                                    <b>18</b>
                                     <v>119</v>
                                 </b>
                                 <b>
-                                    <a>17</a>
+                                    <a>18</a>
                                     <b>21</b>
                                     <v>159</v>
                                 </b>
                                 <b>
-                                    <a>21</a>
-                                    <b>51</b>
+                                    <a>23</a>
+                                    <b>87</b>
                                     <v>159</v>
                                 </b>
-                                <b>
-                                    <a>81</a>
-                                    <b>82</b>
-                                    <v>39</v>
-                                </b>
                             </bs>
                         </hist>
                     </val>
@@ -2416,32 +2415,32 @@
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>159</v>
+                                    <v>239</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>519</v>
+                                    <v>359</v>
                                 </b>
                                 <b>
                                     <a>7</a>
-                                    <b>9</b>
-                                    <v>279</v>
+                                    <b>8</b>
+                                    <v>159</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
-                                    <b>18</b>
+                                    <a>8</a>
+                                    <b>9</b>
                                     <v>279</v>
                                 </b>
                                 <b>
-                                    <a>22</a>
-                                    <b>46</b>
+                                    <a>9</a>
+                                    <b>24</b>
                                     <v>279</v>
                                 </b>
                                 <b>
-                                    <a>88</a>
-                                    <b>89</b>
-                                    <v>39</v>
+                                    <a>27</a>
+                                    <b>86</b>
+                                    <v>239</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2489,21 +2488,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>140</a>
-                                    <b>141</b>
+                                    <a>128</a>
+                                    <b>129</b>
                                     <v>39</v>
                                 </b>
                                 <b>
-                                    <a>150</a>
-                                    <b>151</b>
+                                    <a>142</a>
+                                    <b>143</b>
                                     <v>39</v>
                                 </b>
                             </bs>
@@ -2520,27 +2514,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5274</v>
+                                    <v>4914</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2437</v>
+                                    <v>2237</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1038</v>
+                                    <v>1278</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>5</b>
-                                    <v>759</v>
+                                    <b>6</b>
+                                    <v>799</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>47</b>
-                                    <v>399</v>
+                                    <a>6</a>
+                                    <b>48</b>
+                                    <v>319</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2556,32 +2550,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4195</v>
+                                    <v>4474</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2517</v>
+                                    <v>1957</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1398</v>
+                                    <v>958</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>839</v>
+                                    <v>879</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>9</b>
-                                    <v>839</v>
+                                    <b>6</b>
+                                    <v>559</v>
                                 </b>
                                 <b>
-                                    <a>21</a>
-                                    <b>77</b>
-                                    <v>119</v>
+                                    <a>6</a>
+                                    <b>74</b>
+                                    <v>719</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2597,12 +2591,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7951</v>
+                                    <v>8070</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1957</v>
+                                    <v>1478</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2946,11 +2940,11 @@
                 </e>
                 <e>
                     <k>cpu_seconds</k>
-                    <v>7142</v>
+                    <v>7187</v>
                 </e>
                 <e>
                     <k>elapsed_seconds</k>
-                    <v>135</v>
+                    <v>146</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2996,17 +2990,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5689</v>
+                                    <v>5711</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>912</v>
+                                    <v>1025</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>13</b>
-                                    <v>540</v>
+                                    <b>18</b>
+                                    <v>450</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3022,12 +3016,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6432</v>
+                                    <v>6365</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>709</v>
+                                    <v>822</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3040,24 +3034,29 @@
                         <hist>
                             <budget>12</budget>
                             <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>33</v>
+                                </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>33</v>
+                                    <v>11</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>5</b>
+                                    <a>3</a>
+                                    <b>4</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>8</b>
+                                    <a>10</a>
+                                    <b>11</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
-                                    <b>13</b>
+                                    <a>13</a>
+                                    <b>14</b>
                                     <v>11</v>
                                 </b>
                                 <b>
@@ -3071,23 +3070,23 @@
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>158</a>
-                                    <b>159</b>
+                                    <a>164</a>
+                                    <b>165</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>168</a>
-                                    <b>169</b>
+                                    <a>170</a>
+                                    <b>171</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>183</a>
-                                    <b>184</b>
+                                    <a>181</a>
+                                    <b>182</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>259</a>
-                                    <b>260</b>
+                                    <a>251</a>
+                                    <b>252</b>
                                     <v>11</v>
                                 </b>
                             </bs>
@@ -3101,24 +3100,29 @@
                         <hist>
                             <budget>12</budget>
                             <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>33</v>
+                                </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>33</v>
+                                    <v>11</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>5</b>
+                                    <a>3</a>
+                                    <b>4</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>8</b>
+                                    <a>10</a>
+                                    <b>11</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
-                                    <b>13</b>
+                                    <a>13</a>
+                                    <b>14</b>
                                     <v>11</v>
                                 </b>
                                 <b>
@@ -3127,28 +3131,28 @@
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>52</a>
-                                    <b>53</b>
+                                    <a>51</a>
+                                    <b>52</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>108</a>
-                                    <b>109</b>
+                                    <a>116</a>
+                                    <b>117</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>123</a>
-                                    <b>124</b>
+                                    <a>130</a>
+                                    <b>131</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>141</a>
-                                    <b>142</b>
+                                    <a>145</a>
+                                    <b>146</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>230</a>
-                                    <b>231</b>
+                                    <a>224</a>
+                                    <b>225</b>
                                     <v>11</v>
                                 </b>
                             </bs>
@@ -11844,7 +11848,7 @@
         </relation>
         <relation>
             <name>fileannotations</name>
-            <cardinality>5119099</cardinality>
+            <cardinality>5119131</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -12329,7 +12333,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>45942</v>
+                                    <v>45943</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12686,19 +12690,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>
@@ -12716,7 +12720,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33423519</v>
+                                    <v>33423724</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12732,7 +12736,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33423519</v>
+                                    <v>33423724</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12748,7 +12752,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33423519</v>
+                                    <v>33423724</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12835,7 +12839,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10375</v>
+                                    <v>10376</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -12876,7 +12880,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73600</v>
+                                    <v>73601</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12897,17 +12901,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>
@@ -12922,12 +12926,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>
@@ -12948,12 +12952,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>
@@ -12969,7 +12973,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>758854</v>
+                                    <v>758859</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13042,15 +13046,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>
@@ -13064,7 +13068,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29890367</v>
+                                    <v>29890550</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13080,17 +13084,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>
@@ -13178,11 +13182,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>
@@ -13190,7 +13194,7 @@
                 </e>
                 <e>
                     <k>text</k>
-                    <v>317667</v>
+                    <v>317669</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13204,22 +13208,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>
@@ -13235,22 +13239,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>
@@ -13338,7 +13342,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>23883</v>
+                                    <v>23884</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -13348,7 +13352,7 @@
                                 <b>
                                     <a>12</a>
                                     <b>16</b>
-                                    <v>21472</v>
+                                    <v>21473</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -13384,12 +13388,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>
@@ -13404,11 +13408,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>
@@ -13416,7 +13420,7 @@
                 </e>
                 <e>
                     <k>text</k>
-                    <v>192513</v>
+                    <v>192514</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13430,22 +13434,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>
@@ -13461,22 +13465,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>
@@ -13544,7 +13548,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20751</v>
+                                    <v>20752</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13620,7 +13624,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>80709</v>
+                                    <v>80710</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -17104,7 +17108,7 @@
         </relation>
         <relation>
             <name>using_container</name>
-            <cardinality>465860</cardinality>
+            <cardinality>465863</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
@@ -17112,7 +17116,7 @@
                 </e>
                 <e>
                     <k>child</k>
-                    <v>295394</v>
+                    <v>295396</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17182,12 +17186,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>
@@ -21470,15 +21474,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>
@@ -21492,7 +21496,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1682711</v>
+                                    <v>1682722</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21508,17 +21512,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>
@@ -21819,19 +21823,19 @@
         </relation>
         <relation>
             <name>usertypes</name>
-            <cardinality>5225059</cardinality>
+            <cardinality>5225328</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5225059</v>
+                    <v>5225328</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1348747</v>
+                    <v>1348577</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>5121</v>
+                    <v>5120</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21845,7 +21849,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5225059</v>
+                                    <v>5225328</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21861,7 +21865,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5225059</v>
+                                    <v>5225328</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21877,27 +21881,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>980949</v>
+                                    <v>980825</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>153171</v>
+                                    <v>153152</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>104287</v>
+                                    <v>104273</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>61</b>
-                                    <v>101493</v>
+                                    <v>101480</v>
                                 </b>
                                 <b>
                                     <a>65</a>
                                     <b>874</b>
-                                    <v>8845</v>
+                                    <v>8844</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21913,17 +21917,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1208612</v>
+                                    <v>1208459</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>125237</v>
+                                    <v>124756</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>14898</v>
+                                    <v>15361</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21957,8 +21961,8 @@
                                     <v>465</v>
                                 </b>
                                 <b>
-                                    <a>133</a>
-                                    <b>134</b>
+                                    <a>135</a>
+                                    <b>136</b>
                                     <v>465</v>
                                 </b>
                                 <b>
@@ -22023,8 +22027,8 @@
                                     <v>465</v>
                                 </b>
                                 <b>
-                                    <a>41</a>
-                                    <b>42</b>
+                                    <a>43</a>
+                                    <b>44</b>
                                     <v>465</v>
                                 </b>
                                 <b>
@@ -22065,15 +22069,15 @@
         </relation>
         <relation>
             <name>usertypesize</name>
-            <cardinality>1701647</cardinality>
+            <cardinality>1702363</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1701647</v>
+                    <v>1702363</v>
                 </e>
                 <e>
                     <k>size</k>
-                    <v>13501</v>
+                    <v>13499</v>
                 </e>
                 <e>
                     <k>alignment</k>
@@ -22091,7 +22095,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1701647</v>
+                                    <v>1702363</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22107,7 +22111,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1701647</v>
+                                    <v>1702363</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22128,7 +22132,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4190</v>
+                                    <v>4189</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -22162,7 +22166,7 @@
                                 </b>
                                 <b>
                                     <a>740</a>
-                                    <b>2470</b>
+                                    <b>2472</b>
                                     <v>931</v>
                                 </b>
                             </bs>
@@ -22179,7 +22183,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10242</v>
+                                    <v>10241</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22223,8 +22227,8 @@
                                     <v>465</v>
                                 </b>
                                 <b>
-                                    <a>3209</a>
-                                    <b>3210</b>
+                                    <a>3211</a>
+                                    <b>3212</b>
                                     <v>465</v>
                                 </b>
                             </bs>
@@ -22467,33 +22471,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>1250513</cardinality>
+            <cardinality>1251285</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1250513</v>
+                    <v>1251285</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_complete</name>
-            <cardinality>1641123</cardinality>
+            <cardinality>1641847</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1641123</v>
+                    <v>1641847</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -22599,11 +22603,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>
@@ -22611,7 +22615,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>840961</v>
+                    <v>840966</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22625,17 +22629,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>
@@ -22661,17 +22665,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>
@@ -22784,12 +22788,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>
@@ -22804,7 +22808,7 @@
                                 <b>
                                     <a>10</a>
                                     <b>10265</b>
-                                    <v>27353</v>
+                                    <v>27354</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22820,7 +22824,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>747070</v>
+                                    <v>747075</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23011,15 +23015,15 @@
         </relation>
         <relation>
             <name>is_proxy_class_for</name>
-            <cardinality>61920</cardinality>
+            <cardinality>62843</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>61920</v>
+                    <v>62843</v>
                 </e>
                 <e>
                     <k>templ_param_id</k>
-                    <v>61920</v>
+                    <v>62843</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23033,7 +23037,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>61920</v>
+                                    <v>62843</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23049,7 +23053,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>61920</v>
+                                    <v>62843</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24746,22 +24750,26 @@
             </dependencies>
         </relation>
         <relation>
-            <name>routinetypes</name>
-            <cardinality>532576</cardinality>
+            <name>concept_templates</name>
+            <cardinality>3</cardinality>
             <columnsizes>
                 <e>
-                    <k>id</k>
-                    <v>532576</v>
+                    <k>concept_id</k>
+                    <v>3</v>
                 </e>
                 <e>
-                    <k>return_type</k>
-                    <v>277460</v>
+                    <k>name</k>
+                    <v>3</v>
+                </e>
+                <e>
+                    <k>location</k>
+                    <v>3</v>
                 </e>
             </columnsizes>
             <dependencies>
                 <dep>
-                    <src>id</src>
-                    <trg>return_type</trg>
+                    <src>concept_id</src>
+                    <trg>name</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -24769,15 +24777,15 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>532576</v>
+                                    <v>3</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>return_type</src>
-                    <trg>id</trg>
+                    <src>concept_id</src>
+                    <trg>location</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -24785,45 +24793,15 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241585</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>20794</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>3595</b>
-                                    <v>15079</v>
+                                    <v>3</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>routinetypeargs</name>
-            <cardinality>980484</cardinality>
-            <columnsizes>
-                <e>
-                    <k>routine</k>
-                    <v>422269</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>7914</v>
-                </e>
-                <e>
-                    <k>type_id</k>
-                    <v>226265</v>
-                </e>
-            </columnsizes>
-            <dependencies>
                 <dep>
-                    <src>routine</src>
-                    <trg>index</trg>
+                    <src>name</src>
+                    <trg>concept_id</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -24831,35 +24809,15 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>152240</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>133617</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>63317</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>45625</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>18</b>
-                                    <v>27468</v>
+                                    <v>3</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>routine</src>
-                    <trg>type_id</trg>
+                    <src>name</src>
+                    <trg>location</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -24867,14 +24825,428 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>182036</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>133152</v>
+                                    <v>3</v>
                                 </b>
-                                <b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>concept_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>name</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>concept_template_argument</name>
+            <cardinality>4</cardinality>
+            <columnsizes>
+                <e>
+                    <k>concept_id</k>
+                    <v>3</v>
+                </e>
+                <e>
+                    <k>index</k>
+                    <v>2</v>
+                </e>
+                <e>
+                    <k>arg_type</k>
+                    <v>4</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>concept_id</src>
+                    <trg>index</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>concept_id</src>
+                    <trg>arg_type</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>index</src>
+                    <trg>concept_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>arg_type</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>arg_type</src>
+                    <trg>concept_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>arg_type</src>
+                    <trg>index</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>concept_template_argument_value</name>
+            <cardinality>1</cardinality>
+            <columnsizes>
+                <e>
+                    <k>type_id</k>
+                    <v>1</v>
+                </e>
+                <e>
+                    <k>index</k>
+                    <v>1</v>
+                </e>
+                <e>
+                    <k>arg_value</k>
+                    <v>1</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>type_id</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>arg_value</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>index</src>
+                    <trg>arg_value</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>arg_value</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>arg_value</src>
+                    <trg>index</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>routinetypes</name>
+            <cardinality>532576</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>532576</v>
+                </e>
+                <e>
+                    <k>return_type</k>
+                    <v>277460</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>return_type</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>532576</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>return_type</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>241585</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>20794</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>3595</b>
+                                    <v>15079</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>routinetypeargs</name>
+            <cardinality>980484</cardinality>
+            <columnsizes>
+                <e>
+                    <k>routine</k>
+                    <v>422269</v>
+                </e>
+                <e>
+                    <k>index</k>
+                    <v>7914</v>
+                </e>
+                <e>
+                    <k>type_id</k>
+                    <v>226265</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>routine</src>
+                    <trg>index</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>152240</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>133617</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>63317</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>45625</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>18</b>
+                                    <v>27468</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>routine</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>182036</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>133152</v>
+                                </b>
+                                <b>
                                     <a>3</a>
                                     <b>4</b>
                                     <v>58661</v>
@@ -25290,11 +25662,11 @@
         </relation>
         <relation>
             <name>typespecifiers</name>
-            <cardinality>1129000</cardinality>
+            <cardinality>1129788</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>1110843</v>
+                    <v>1111633</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -25312,12 +25684,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1092685</v>
+                                    <v>1093478</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>18157</v>
+                                    <v>18154</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25358,7 +25730,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>
@@ -30615,7 +30992,7 @@
                 </e>
                 <e>
                     <k>fun</k>
-                    <v>509941</v>
+                    <v>509922</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30650,12 +31027,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>314199</v>
+                                    <v>314161</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>77701</v>
+                                    <v>77720</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -32435,15 +32812,15 @@
         </relation>
         <relation>
             <name>expr_types</name>
-            <cardinality>18452857</cardinality>
+            <cardinality>18452812</cardinality>
             <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>
@@ -32461,12 +32838,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18190066</v>
+                                    <v>18190110</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>131395</v>
+                                    <v>131351</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32482,7 +32859,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18321462</v>
+                                    <v>18321461</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32498,17 +32875,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>
@@ -32518,7 +32895,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>109223</v>
+                                    <v>109224</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -32549,12 +32926,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>
@@ -32583,8 +32960,8 @@
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>1242905</a>
-                                    <b>1242906</b>
+                                    <a>1242895</a>
+                                    <b>1242896</b>
                                     <v>11</v>
                                 </b>
                             </bs>