diff --git a/cpp/src/IceGrid/Grammar.cpp b/cpp/src/IceGrid/Grammar.cpp
index f1e03e3688d..2fd0b6a6863 100644
--- a/cpp/src/IceGrid/Grammar.cpp
+++ b/cpp/src/IceGrid/Grammar.cpp
@@ -77,7 +77,7 @@
 
 
 /* First part of user prologue.  */
-#line 37 "src/IceGrid/Grammar.y"
+#line 35 "src/IceGrid/Grammar.y"
 
 
 #include "Ice/Ice.h"
@@ -203,7 +203,7 @@ typedef enum yysymbol_kind_t yysymbol_kind_t;
 
 
 /* Unqualified %code blocks.  */
-#line 29 "src/IceGrid/Grammar.y"
+#line 27 "src/IceGrid/Grammar.y"
 
 
 // Forward declaration of the lexing function generated by flex, so bison knows about it.
@@ -596,23 +596,23 @@ static const yytype_int8 yytranslate[] =
 /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_int16 yyrline[] =
 {
-       0,   132,   132,   135,   143,   146,   154,   163,   167,   171,
-     175,   179,   183,   187,   191,   195,   199,   203,   207,   211,
-     215,   219,   223,   227,   231,   235,   239,   243,   247,   251,
-     255,   259,   263,   267,   271,   275,   279,   283,   287,   291,
-     295,   299,   303,   307,   311,   315,   319,   323,   327,   331,
-     335,   339,   343,   347,   351,   355,   359,   363,   367,   371,
-     375,   379,   383,   387,   391,   395,   399,   403,   407,   411,
-     415,   419,   423,   427,   431,   435,   439,   443,   447,   451,
-     455,   459,   463,   467,   471,   475,   479,   483,   487,   491,
-     495,   499,   503,   507,   511,   515,   519,   523,   527,   531,
-     535,   539,   543,   547,   551,   555,   559,   563,   567,   571,
-     575,   579,   583,   587,   591,   602,   606,   617,   628,   632,
-     636,   640,   646,   651,   656,   660,   668,   673,   678,   684,
-     690,   699,   702,   705,   708,   711,   714,   717,   720,   723,
-     726,   729,   732,   735,   738,   741,   744,   747,   750,   753,
-     756,   759,   762,   765,   768,   771,   774,   777,   780,   783,
-     786,   789,   792,   795,   798,   801,   804,   807
+       0,   130,   130,   133,   141,   144,   152,   161,   165,   169,
+     173,   177,   181,   185,   189,   193,   197,   201,   205,   209,
+     213,   217,   221,   225,   229,   233,   237,   241,   245,   249,
+     253,   257,   261,   265,   269,   273,   277,   281,   285,   289,
+     293,   297,   301,   305,   309,   313,   317,   321,   325,   329,
+     333,   337,   341,   345,   349,   353,   357,   361,   365,   369,
+     373,   377,   381,   385,   389,   393,   397,   401,   405,   409,
+     413,   417,   421,   425,   429,   433,   437,   441,   445,   449,
+     453,   457,   461,   465,   469,   473,   477,   481,   485,   489,
+     493,   497,   501,   505,   509,   513,   517,   521,   525,   529,
+     533,   537,   541,   545,   549,   553,   557,   561,   565,   569,
+     573,   577,   581,   585,   589,   600,   604,   615,   626,   630,
+     634,   638,   644,   649,   654,   658,   666,   671,   676,   682,
+     688,   697,   700,   703,   706,   709,   712,   715,   718,   721,
+     724,   727,   730,   733,   736,   739,   742,   745,   748,   751,
+     754,   757,   760,   763,   766,   769,   772,   775,   778,   781,
+     784,   787,   790,   793,   796,   799,   802,   805
 };
 #endif
 
@@ -1815,35 +1815,35 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
   switch (yyn)
     {
   case 2: /* start: commands  */
-#line 133 "src/IceGrid/Grammar.y"
+#line 131 "src/IceGrid/Grammar.y"
 {
 }
 #line 1822 "src/IceGrid/Grammar.cpp"
     break;
 
   case 3: /* start: %empty  */
-#line 136 "src/IceGrid/Grammar.y"
+#line 134 "src/IceGrid/Grammar.y"
 {
 }
 #line 1829 "src/IceGrid/Grammar.cpp"
     break;
 
   case 4: /* commands: commands checkInterrupted command  */
-#line 144 "src/IceGrid/Grammar.y"
+#line 142 "src/IceGrid/Grammar.y"
 {
 }
 #line 1836 "src/IceGrid/Grammar.cpp"
     break;
 
   case 5: /* commands: checkInterrupted command  */
-#line 147 "src/IceGrid/Grammar.y"
+#line 145 "src/IceGrid/Grammar.y"
 {
 }
 #line 1843 "src/IceGrid/Grammar.cpp"
     break;
 
   case 6: /* checkInterrupted: %empty  */
-#line 155 "src/IceGrid/Grammar.y"
+#line 153 "src/IceGrid/Grammar.y"
 {
     parser->checkInterrupted();
 }
@@ -1851,7 +1851,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 7: /* command: ICEGRID_HELP ';'  */
-#line 164 "src/IceGrid/Grammar.y"
+#line 162 "src/IceGrid/Grammar.y"
 {
     parser->usage();
 }
@@ -1859,7 +1859,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 8: /* command: ICEGRID_EXIT ';'  */
-#line 168 "src/IceGrid/Grammar.y"
+#line 166 "src/IceGrid/Grammar.y"
 {
     return 0;
 }
@@ -1867,7 +1867,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 9: /* command: ICEGRID_APPLICATION ICEGRID_ADD strings ';'  */
-#line 172 "src/IceGrid/Grammar.y"
+#line 170 "src/IceGrid/Grammar.y"
 {
     parser->addApplication(yyvsp[-1]);
 }
@@ -1875,7 +1875,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 10: /* command: ICEGRID_APPLICATION ICEGRID_ADD ICEGRID_HELP ';'  */
-#line 176 "src/IceGrid/Grammar.y"
+#line 174 "src/IceGrid/Grammar.y"
 {
     parser->usage("application", "add");
 }
@@ -1883,7 +1883,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 11: /* command: ICEGRID_APPLICATION ICEGRID_REMOVE strings ';'  */
-#line 180 "src/IceGrid/Grammar.y"
+#line 178 "src/IceGrid/Grammar.y"
 {
     parser->removeApplication(yyvsp[-1]);
 }
@@ -1891,7 +1891,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 12: /* command: ICEGRID_APPLICATION ICEGRID_REMOVE ICEGRID_HELP ';'  */
-#line 184 "src/IceGrid/Grammar.y"
+#line 182 "src/IceGrid/Grammar.y"
 {
     parser->usage("application", "remove");
 }
@@ -1899,7 +1899,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 13: /* command: ICEGRID_APPLICATION ICEGRID_DIFF strings ';'  */
-#line 188 "src/IceGrid/Grammar.y"
+#line 186 "src/IceGrid/Grammar.y"
 {
     parser->diffApplication(yyvsp[-1]);
 }
@@ -1907,7 +1907,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 14: /* command: ICEGRID_APPLICATION ICEGRID_DIFF ICEGRID_HELP ';'  */
-#line 192 "src/IceGrid/Grammar.y"
+#line 190 "src/IceGrid/Grammar.y"
 {
     parser->usage("application", "diff");
 }
@@ -1915,7 +1915,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 15: /* command: ICEGRID_APPLICATION ICEGRID_UPDATE strings ';'  */
-#line 196 "src/IceGrid/Grammar.y"
+#line 194 "src/IceGrid/Grammar.y"
 {
     parser->updateApplication(yyvsp[-1]);
 }
@@ -1923,7 +1923,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 16: /* command: ICEGRID_APPLICATION ICEGRID_UPDATE ICEGRID_HELP ';'  */
-#line 200 "src/IceGrid/Grammar.y"
+#line 198 "src/IceGrid/Grammar.y"
 {
     parser->usage("application", "update");
 }
@@ -1931,7 +1931,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 17: /* command: ICEGRID_APPLICATION ICEGRID_DESCRIBE strings ';'  */
-#line 204 "src/IceGrid/Grammar.y"
+#line 202 "src/IceGrid/Grammar.y"
 {
     parser->describeApplication(yyvsp[-1]);
 }
@@ -1939,7 +1939,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 18: /* command: ICEGRID_APPLICATION ICEGRID_DESCRIBE ICEGRID_HELP ';'  */
-#line 208 "src/IceGrid/Grammar.y"
+#line 206 "src/IceGrid/Grammar.y"
 {
     parser->usage("application", "describe");
 }
@@ -1947,7 +1947,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 19: /* command: ICEGRID_APPLICATION ICEGRID_LIST strings ';'  */
-#line 212 "src/IceGrid/Grammar.y"
+#line 210 "src/IceGrid/Grammar.y"
 {
     parser->listAllApplications(yyvsp[-1]);
 }
@@ -1955,7 +1955,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 20: /* command: ICEGRID_APPLICATION ICEGRID_LIST ICEGRID_HELP ';'  */
-#line 216 "src/IceGrid/Grammar.y"
+#line 214 "src/IceGrid/Grammar.y"
 {
     parser->usage("application", "list");
 }
@@ -1963,7 +1963,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 21: /* command: ICEGRID_SERVER ICEGRID_TEMPLATE ICEGRID_DESCRIBE strings ';'  */
-#line 220 "src/IceGrid/Grammar.y"
+#line 218 "src/IceGrid/Grammar.y"
 {
     parser->describeServerTemplate(yyvsp[-1]);
 }
@@ -1971,7 +1971,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 22: /* command: ICEGRID_SERVER ICEGRID_TEMPLATE ICEGRID_DESCRIBE ICEGRID_HELP ';'  */
-#line 224 "src/IceGrid/Grammar.y"
+#line 222 "src/IceGrid/Grammar.y"
 {
     parser->usage("server template", "describe");
 }
@@ -1979,7 +1979,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 23: /* command: ICEGRID_SERVER ICEGRID_TEMPLATE ICEGRID_INSTANTIATE strings ';'  */
-#line 228 "src/IceGrid/Grammar.y"
+#line 226 "src/IceGrid/Grammar.y"
 {
     parser->instantiateServerTemplate(yyvsp[-1]);
 }
@@ -1987,7 +1987,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 24: /* command: ICEGRID_SERVER ICEGRID_TEMPLATE ICEGRID_INSTANTIATE ICEGRID_HELP ';'  */
-#line 232 "src/IceGrid/Grammar.y"
+#line 230 "src/IceGrid/Grammar.y"
 {
     parser->usage("server template", "instantiate");
 }
@@ -1995,7 +1995,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 25: /* command: ICEGRID_SERVER ICEGRID_TEMPLATE ICEGRID_HELP ';'  */
-#line 236 "src/IceGrid/Grammar.y"
+#line 234 "src/IceGrid/Grammar.y"
 {
     parser->usage("server template");
 }
@@ -2003,7 +2003,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 26: /* command: ICEGRID_SERVICE ICEGRID_TEMPLATE ICEGRID_DESCRIBE strings ';'  */
-#line 240 "src/IceGrid/Grammar.y"
+#line 238 "src/IceGrid/Grammar.y"
 {
     parser->describeServiceTemplate(yyvsp[-1]);
 }
@@ -2011,7 +2011,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 27: /* command: ICEGRID_SERVICE ICEGRID_TEMPLATE ICEGRID_DESCRIBE ICEGRID_HELP ';'  */
-#line 244 "src/IceGrid/Grammar.y"
+#line 242 "src/IceGrid/Grammar.y"
 {
     parser->usage("service template", "describe");
 }
@@ -2019,7 +2019,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 28: /* command: ICEGRID_SERVICE ICEGRID_TEMPLATE ICEGRID_HELP ';'  */
-#line 248 "src/IceGrid/Grammar.y"
+#line 246 "src/IceGrid/Grammar.y"
 {
     parser->usage("service template");
 }
@@ -2027,7 +2027,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 29: /* command: ICEGRID_NODE ICEGRID_DESCRIBE strings ';'  */
-#line 252 "src/IceGrid/Grammar.y"
+#line 250 "src/IceGrid/Grammar.y"
 {
     parser->describeNode(yyvsp[-1]);
 }
@@ -2035,7 +2035,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 30: /* command: ICEGRID_NODE ICEGRID_DESCRIBE ICEGRID_HELP ';'  */
-#line 256 "src/IceGrid/Grammar.y"
+#line 254 "src/IceGrid/Grammar.y"
 {
     parser->usage("node", "describe");
 }
@@ -2043,7 +2043,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 31: /* command: ICEGRID_NODE ICEGRID_PING strings ';'  */
-#line 260 "src/IceGrid/Grammar.y"
+#line 258 "src/IceGrid/Grammar.y"
 {
     parser->pingNode(yyvsp[-1]);
 }
@@ -2051,7 +2051,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 32: /* command: ICEGRID_NODE ICEGRID_PING ICEGRID_HELP ';'  */
-#line 264 "src/IceGrid/Grammar.y"
+#line 262 "src/IceGrid/Grammar.y"
 {
     parser->usage("node", "ping");
 }
@@ -2059,7 +2059,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 33: /* command: ICEGRID_NODE ICEGRID_LOAD strings ';'  */
-#line 268 "src/IceGrid/Grammar.y"
+#line 266 "src/IceGrid/Grammar.y"
 {
     parser->printLoadNode(yyvsp[-1]);
 }
@@ -2067,7 +2067,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 34: /* command: ICEGRID_NODE ICEGRID_LOAD ICEGRID_HELP ';'  */
-#line 272 "src/IceGrid/Grammar.y"
+#line 270 "src/IceGrid/Grammar.y"
 {
     parser->usage("node", "load");
 }
@@ -2075,7 +2075,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 35: /* command: ICEGRID_NODE ICEGRID_SOCKETS strings ';'  */
-#line 276 "src/IceGrid/Grammar.y"
+#line 274 "src/IceGrid/Grammar.y"
 {
     parser->printNodeProcessorSockets(yyvsp[-1]);
 }
@@ -2083,7 +2083,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 36: /* command: ICEGRID_NODE ICEGRID_SOCKETS ICEGRID_HELP ';'  */
-#line 280 "src/IceGrid/Grammar.y"
+#line 278 "src/IceGrid/Grammar.y"
 {
     parser->usage("node", "sockets");
 }
@@ -2091,7 +2091,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 37: /* command: ICEGRID_NODE ICEGRID_SHUTDOWN strings ';'  */
-#line 284 "src/IceGrid/Grammar.y"
+#line 282 "src/IceGrid/Grammar.y"
 {
     parser->shutdownNode(yyvsp[-1]);
 }
@@ -2099,7 +2099,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 38: /* command: ICEGRID_NODE ICEGRID_SHUTDOWN ICEGRID_HELP ';'  */
-#line 288 "src/IceGrid/Grammar.y"
+#line 286 "src/IceGrid/Grammar.y"
 {
     parser->usage("node", "shutdown");
 }
@@ -2107,7 +2107,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 39: /* command: ICEGRID_NODE ICEGRID_LIST strings ';'  */
-#line 292 "src/IceGrid/Grammar.y"
+#line 290 "src/IceGrid/Grammar.y"
 {
     parser->listAllNodes(yyvsp[-1]);
 }
@@ -2115,7 +2115,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 40: /* command: ICEGRID_NODE ICEGRID_LIST ICEGRID_HELP ';'  */
-#line 296 "src/IceGrid/Grammar.y"
+#line 294 "src/IceGrid/Grammar.y"
 {
     parser->usage("node", "list");
 }
@@ -2123,7 +2123,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 41: /* command: ICEGRID_NODE ICEGRID_SHOW strings ';'  */
-#line 300 "src/IceGrid/Grammar.y"
+#line 298 "src/IceGrid/Grammar.y"
 {
     parser->show("node", yyvsp[-1]);
 }
@@ -2131,7 +2131,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 42: /* command: ICEGRID_NODE ICEGRID_SHOW ICEGRID_HELP ';'  */
-#line 304 "src/IceGrid/Grammar.y"
+#line 302 "src/IceGrid/Grammar.y"
 {
     parser->usage("node", "show");
 }
@@ -2139,7 +2139,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 43: /* command: ICEGRID_REGISTRY ICEGRID_DESCRIBE strings ';'  */
-#line 308 "src/IceGrid/Grammar.y"
+#line 306 "src/IceGrid/Grammar.y"
 {
     parser->describeRegistry(yyvsp[-1]);
 }
@@ -2147,7 +2147,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 44: /* command: ICEGRID_REGISTRY ICEGRID_DESCRIBE ICEGRID_HELP ';'  */
-#line 312 "src/IceGrid/Grammar.y"
+#line 310 "src/IceGrid/Grammar.y"
 {
     parser->usage("registry", "describe");
 }
@@ -2155,7 +2155,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 45: /* command: ICEGRID_REGISTRY ICEGRID_PING strings ';'  */
-#line 316 "src/IceGrid/Grammar.y"
+#line 314 "src/IceGrid/Grammar.y"
 {
     parser->pingRegistry(yyvsp[-1]);
 }
@@ -2163,7 +2163,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 46: /* command: ICEGRID_REGISTRY ICEGRID_PING ICEGRID_HELP ';'  */
-#line 320 "src/IceGrid/Grammar.y"
+#line 318 "src/IceGrid/Grammar.y"
 {
     parser->usage("registry", "ping");
 }
@@ -2171,7 +2171,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 47: /* command: ICEGRID_REGISTRY ICEGRID_SHUTDOWN strings ';'  */
-#line 324 "src/IceGrid/Grammar.y"
+#line 322 "src/IceGrid/Grammar.y"
 {
     parser->shutdownRegistry(yyvsp[-1]);
 }
@@ -2179,7 +2179,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 48: /* command: ICEGRID_REGISTRY ICEGRID_SHUTDOWN ICEGRID_HELP ';'  */
-#line 328 "src/IceGrid/Grammar.y"
+#line 326 "src/IceGrid/Grammar.y"
 {
     parser->usage("registry", "shutdown");
 }
@@ -2187,7 +2187,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 49: /* command: ICEGRID_REGISTRY ICEGRID_LIST strings ';'  */
-#line 332 "src/IceGrid/Grammar.y"
+#line 330 "src/IceGrid/Grammar.y"
 {
     parser->listAllRegistries(yyvsp[-1]);
 }
@@ -2195,7 +2195,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 50: /* command: ICEGRID_REGISTRY ICEGRID_LIST ICEGRID_HELP ';'  */
-#line 336 "src/IceGrid/Grammar.y"
+#line 334 "src/IceGrid/Grammar.y"
 {
     parser->usage("registry", "list");
 }
@@ -2203,7 +2203,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 51: /* command: ICEGRID_REGISTRY ICEGRID_SHOW strings ';'  */
-#line 340 "src/IceGrid/Grammar.y"
+#line 338 "src/IceGrid/Grammar.y"
 {
     parser->show("registry", yyvsp[-1]);
 }
@@ -2211,7 +2211,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 52: /* command: ICEGRID_REGISTRY ICEGRID_SHOW ICEGRID_HELP ';'  */
-#line 344 "src/IceGrid/Grammar.y"
+#line 342 "src/IceGrid/Grammar.y"
 {
     parser->usage("registry", "show");
 }
@@ -2219,7 +2219,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 53: /* command: ICEGRID_SERVER ICEGRID_REMOVE strings ';'  */
-#line 348 "src/IceGrid/Grammar.y"
+#line 346 "src/IceGrid/Grammar.y"
 {
     parser->removeServer(yyvsp[-1]);
 }
@@ -2227,7 +2227,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 54: /* command: ICEGRID_SERVER ICEGRID_REMOVE ICEGRID_HELP ';'  */
-#line 352 "src/IceGrid/Grammar.y"
+#line 350 "src/IceGrid/Grammar.y"
 {
     parser->usage("server", "remove");
 }
@@ -2235,7 +2235,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 55: /* command: ICEGRID_SERVER ICEGRID_DESCRIBE strings ';'  */
-#line 356 "src/IceGrid/Grammar.y"
+#line 354 "src/IceGrid/Grammar.y"
 {
     parser->describeServer(yyvsp[-1]);
 }
@@ -2243,7 +2243,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 56: /* command: ICEGRID_SERVER ICEGRID_DESCRIBE ICEGRID_HELP ';'  */
-#line 360 "src/IceGrid/Grammar.y"
+#line 358 "src/IceGrid/Grammar.y"
 {
     parser->usage("server", "describe");
 }
@@ -2251,7 +2251,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 57: /* command: ICEGRID_SERVER ICEGRID_START strings ';'  */
-#line 364 "src/IceGrid/Grammar.y"
+#line 362 "src/IceGrid/Grammar.y"
 {
     parser->startServer(yyvsp[-1]);
 }
@@ -2259,7 +2259,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 58: /* command: ICEGRID_SERVER ICEGRID_START ICEGRID_HELP ';'  */
-#line 368 "src/IceGrid/Grammar.y"
+#line 366 "src/IceGrid/Grammar.y"
 {
     parser->usage("server", "start");
 }
@@ -2267,7 +2267,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 59: /* command: ICEGRID_SERVER ICEGRID_STOP strings ';'  */
-#line 372 "src/IceGrid/Grammar.y"
+#line 370 "src/IceGrid/Grammar.y"
 {
     parser->stopServer(yyvsp[-1]);
 }
@@ -2275,7 +2275,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 60: /* command: ICEGRID_SERVER ICEGRID_STOP ICEGRID_HELP ';'  */
-#line 376 "src/IceGrid/Grammar.y"
+#line 374 "src/IceGrid/Grammar.y"
 {
     parser->usage("server", "stop");
 }
@@ -2283,7 +2283,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 61: /* command: ICEGRID_SERVER ICEGRID_SIGNAL strings ';'  */
-#line 380 "src/IceGrid/Grammar.y"
+#line 378 "src/IceGrid/Grammar.y"
 {
     parser->signalServer(yyvsp[-1]);
 }
@@ -2291,7 +2291,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 62: /* command: ICEGRID_SERVER ICEGRID_SIGNAL ICEGRID_HELP ';'  */
-#line 384 "src/IceGrid/Grammar.y"
+#line 382 "src/IceGrid/Grammar.y"
 {
     parser->usage("server", "signal");
 }
@@ -2299,7 +2299,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 63: /* command: ICEGRID_SERVER ICEGRID_STDOUT strings ';'  */
-#line 388 "src/IceGrid/Grammar.y"
+#line 386 "src/IceGrid/Grammar.y"
 {
     parser->writeMessage(yyvsp[-1], 1);
 }
@@ -2307,7 +2307,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 64: /* command: ICEGRID_SERVER ICEGRID_STDOUT ICEGRID_HELP ';'  */
-#line 392 "src/IceGrid/Grammar.y"
+#line 390 "src/IceGrid/Grammar.y"
 {
     parser->usage("server", "stdout");
 }
@@ -2315,7 +2315,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 65: /* command: ICEGRID_SERVER ICEGRID_STDERR strings ';'  */
-#line 396 "src/IceGrid/Grammar.y"
+#line 394 "src/IceGrid/Grammar.y"
 {
     parser->writeMessage(yyvsp[-1], 2);
 }
@@ -2323,7 +2323,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 66: /* command: ICEGRID_SERVER ICEGRID_STDERR ICEGRID_HELP ';'  */
-#line 400 "src/IceGrid/Grammar.y"
+#line 398 "src/IceGrid/Grammar.y"
 {
     parser->usage("server", "stderr");
 }
@@ -2331,7 +2331,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 67: /* command: ICEGRID_SERVER ICEGRID_STATE strings ';'  */
-#line 404 "src/IceGrid/Grammar.y"
+#line 402 "src/IceGrid/Grammar.y"
 {
     parser->stateServer(yyvsp[-1]);
 }
@@ -2339,7 +2339,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 68: /* command: ICEGRID_SERVER ICEGRID_STATE ICEGRID_HELP ';'  */
-#line 408 "src/IceGrid/Grammar.y"
+#line 406 "src/IceGrid/Grammar.y"
 {
     parser->usage("server", "start");
 }
@@ -2347,7 +2347,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 69: /* command: ICEGRID_SERVER ICEGRID_PID strings ';'  */
-#line 412 "src/IceGrid/Grammar.y"
+#line 410 "src/IceGrid/Grammar.y"
 {
     parser->pidServer(yyvsp[-1]);
 }
@@ -2355,7 +2355,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 70: /* command: ICEGRID_SERVER ICEGRID_PID ICEGRID_HELP ';'  */
-#line 416 "src/IceGrid/Grammar.y"
+#line 414 "src/IceGrid/Grammar.y"
 {
     parser->usage("server", "pid");
 }
@@ -2363,7 +2363,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 71: /* command: ICEGRID_SERVER ICEGRID_PROPERTIES strings ';'  */
-#line 420 "src/IceGrid/Grammar.y"
+#line 418 "src/IceGrid/Grammar.y"
 {
     parser->propertiesServer(yyvsp[-1], false);
 }
@@ -2371,7 +2371,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 72: /* command: ICEGRID_SERVER ICEGRID_PROPERTIES ICEGRID_HELP ';'  */
-#line 424 "src/IceGrid/Grammar.y"
+#line 422 "src/IceGrid/Grammar.y"
 {
     parser->usage("server", "properties");
 }
@@ -2379,7 +2379,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 73: /* command: ICEGRID_SERVER ICEGRID_PROPERTY strings ';'  */
-#line 428 "src/IceGrid/Grammar.y"
+#line 426 "src/IceGrid/Grammar.y"
 {
     parser->propertiesServer(yyvsp[-1], true);
 }
@@ -2387,7 +2387,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 74: /* command: ICEGRID_SERVER ICEGRID_PROPERTY ICEGRID_HELP ';'  */
-#line 432 "src/IceGrid/Grammar.y"
+#line 430 "src/IceGrid/Grammar.y"
 {
     parser->usage("server", "property");
 }
@@ -2395,7 +2395,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 75: /* command: ICEGRID_SERVER ICEGRID_ENABLE strings ';'  */
-#line 436 "src/IceGrid/Grammar.y"
+#line 434 "src/IceGrid/Grammar.y"
 {
     parser->enableServer(yyvsp[-1], true);
 }
@@ -2403,7 +2403,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 76: /* command: ICEGRID_SERVER ICEGRID_ENABLE ICEGRID_HELP ';'  */
-#line 440 "src/IceGrid/Grammar.y"
+#line 438 "src/IceGrid/Grammar.y"
 {
     parser->usage("server", "enable");
 }
@@ -2411,7 +2411,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 77: /* command: ICEGRID_SERVER ICEGRID_DISABLE strings ';'  */
-#line 444 "src/IceGrid/Grammar.y"
+#line 442 "src/IceGrid/Grammar.y"
 {
     parser->enableServer(yyvsp[-1], false);
 }
@@ -2419,7 +2419,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 78: /* command: ICEGRID_SERVER ICEGRID_DISABLE ICEGRID_HELP ';'  */
-#line 448 "src/IceGrid/Grammar.y"
+#line 446 "src/IceGrid/Grammar.y"
 {
     parser->usage("server", "disable");
 }
@@ -2427,7 +2427,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 79: /* command: ICEGRID_SERVER ICEGRID_LIST strings ';'  */
-#line 452 "src/IceGrid/Grammar.y"
+#line 450 "src/IceGrid/Grammar.y"
 {
     parser->listAllServers(yyvsp[-1]);
 }
@@ -2435,7 +2435,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 80: /* command: ICEGRID_SERVER ICEGRID_LIST ICEGRID_HELP ';'  */
-#line 456 "src/IceGrid/Grammar.y"
+#line 454 "src/IceGrid/Grammar.y"
 {
     parser->usage("server", "list");
 }
@@ -2443,7 +2443,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 81: /* command: ICEGRID_SERVER ICEGRID_SHOW strings ';'  */
-#line 460 "src/IceGrid/Grammar.y"
+#line 458 "src/IceGrid/Grammar.y"
 {
     parser->show("server", yyvsp[-1]);
 }
@@ -2451,7 +2451,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 82: /* command: ICEGRID_SERVER ICEGRID_SHOW ICEGRID_HELP ';'  */
-#line 464 "src/IceGrid/Grammar.y"
+#line 462 "src/IceGrid/Grammar.y"
 {
     parser->usage("server", "show");
 }
@@ -2459,7 +2459,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 83: /* command: ICEGRID_SERVICE ICEGRID_START strings ';'  */
-#line 468 "src/IceGrid/Grammar.y"
+#line 466 "src/IceGrid/Grammar.y"
 {
     parser->startService(yyvsp[-1]);
 }
@@ -2467,7 +2467,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 84: /* command: ICEGRID_SERVICE ICEGRID_START ICEGRID_HELP ';'  */
-#line 472 "src/IceGrid/Grammar.y"
+#line 470 "src/IceGrid/Grammar.y"
 {
     parser->usage("service", "start");
 }
@@ -2475,7 +2475,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 85: /* command: ICEGRID_SERVICE ICEGRID_STOP strings ';'  */
-#line 476 "src/IceGrid/Grammar.y"
+#line 474 "src/IceGrid/Grammar.y"
 {
     parser->stopService(yyvsp[-1]);
 }
@@ -2483,7 +2483,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 86: /* command: ICEGRID_SERVICE ICEGRID_STOP ICEGRID_HELP ';'  */
-#line 480 "src/IceGrid/Grammar.y"
+#line 478 "src/IceGrid/Grammar.y"
 {
     parser->usage("service", "stop");
 }
@@ -2491,7 +2491,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 87: /* command: ICEGRID_SERVICE ICEGRID_DESCRIBE strings ';'  */
-#line 484 "src/IceGrid/Grammar.y"
+#line 482 "src/IceGrid/Grammar.y"
 {
     parser->describeService(yyvsp[-1]);
 }
@@ -2499,7 +2499,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 88: /* command: ICEGRID_SERVICE ICEGRID_DESCRIBE ICEGRID_HELP ';'  */
-#line 488 "src/IceGrid/Grammar.y"
+#line 486 "src/IceGrid/Grammar.y"
 {
     parser->usage("service", "describe");
 }
@@ -2507,7 +2507,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 89: /* command: ICEGRID_SERVICE ICEGRID_PROPERTIES strings ';'  */
-#line 492 "src/IceGrid/Grammar.y"
+#line 490 "src/IceGrid/Grammar.y"
 {
     parser->propertiesService(yyvsp[-1], false);
 }
@@ -2515,7 +2515,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 90: /* command: ICEGRID_SERVICE ICEGRID_PROPERTIES ICEGRID_HELP ';'  */
-#line 496 "src/IceGrid/Grammar.y"
+#line 494 "src/IceGrid/Grammar.y"
 {
     parser->usage("service", "properties");
 }
@@ -2523,7 +2523,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 91: /* command: ICEGRID_SERVICE ICEGRID_PROPERTY strings ';'  */
-#line 500 "src/IceGrid/Grammar.y"
+#line 498 "src/IceGrid/Grammar.y"
 {
     parser->propertiesService(yyvsp[-1], true);
 }
@@ -2531,7 +2531,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 92: /* command: ICEGRID_SERVICE ICEGRID_PROPERTY ICEGRID_HELP ';'  */
-#line 504 "src/IceGrid/Grammar.y"
+#line 502 "src/IceGrid/Grammar.y"
 {
     parser->usage("service", "property");
 }
@@ -2539,7 +2539,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 93: /* command: ICEGRID_SERVICE ICEGRID_LIST strings ';'  */
-#line 508 "src/IceGrid/Grammar.y"
+#line 506 "src/IceGrid/Grammar.y"
 {
     parser->listServices(yyvsp[-1]);
 }
@@ -2547,7 +2547,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 94: /* command: ICEGRID_SERVICE ICEGRID_LIST ICEGRID_HELP ';'  */
-#line 512 "src/IceGrid/Grammar.y"
+#line 510 "src/IceGrid/Grammar.y"
 {
     parser->usage("service", "list");
 }
@@ -2555,7 +2555,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 95: /* command: ICEGRID_ADAPTER ICEGRID_ENDPOINTS strings ';'  */
-#line 516 "src/IceGrid/Grammar.y"
+#line 514 "src/IceGrid/Grammar.y"
 {
     parser->endpointsAdapter(yyvsp[-1]);
 }
@@ -2563,7 +2563,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 96: /* command: ICEGRID_ADAPTER ICEGRID_ENDPOINTS ICEGRID_HELP ';'  */
-#line 520 "src/IceGrid/Grammar.y"
+#line 518 "src/IceGrid/Grammar.y"
 {
     parser->usage("adapter", "endpoints");
 }
@@ -2571,7 +2571,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 97: /* command: ICEGRID_ADAPTER ICEGRID_REMOVE strings ';'  */
-#line 524 "src/IceGrid/Grammar.y"
+#line 522 "src/IceGrid/Grammar.y"
 {
     parser->removeAdapter(yyvsp[-1]);
 }
@@ -2579,7 +2579,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 98: /* command: ICEGRID_ADAPTER ICEGRID_REMOVE ICEGRID_HELP ';'  */
-#line 528 "src/IceGrid/Grammar.y"
+#line 526 "src/IceGrid/Grammar.y"
 {
     parser->usage("adapter", "remove");
 }
@@ -2587,7 +2587,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 99: /* command: ICEGRID_ADAPTER ICEGRID_LIST strings ';'  */
-#line 532 "src/IceGrid/Grammar.y"
+#line 530 "src/IceGrid/Grammar.y"
 {
     parser->listAllAdapters(yyvsp[-1]);
 }
@@ -2595,7 +2595,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 100: /* command: ICEGRID_ADAPTER ICEGRID_LIST ICEGRID_HELP ';'  */
-#line 536 "src/IceGrid/Grammar.y"
+#line 534 "src/IceGrid/Grammar.y"
 {
     parser->usage("adapter", "list");
 }
@@ -2603,7 +2603,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 101: /* command: ICEGRID_OBJECT ICEGRID_ADD strings ';'  */
-#line 540 "src/IceGrid/Grammar.y"
+#line 538 "src/IceGrid/Grammar.y"
 {
     parser->addObject(yyvsp[-1]);
 }
@@ -2611,7 +2611,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 102: /* command: ICEGRID_OBJECT ICEGRID_ADD ICEGRID_HELP ';'  */
-#line 544 "src/IceGrid/Grammar.y"
+#line 542 "src/IceGrid/Grammar.y"
 {
     parser->usage("object", "add");
 }
@@ -2619,7 +2619,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 103: /* command: ICEGRID_OBJECT ICEGRID_REMOVE strings ';'  */
-#line 548 "src/IceGrid/Grammar.y"
+#line 546 "src/IceGrid/Grammar.y"
 {
     parser->removeObject(yyvsp[-1]);
 }
@@ -2627,7 +2627,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 104: /* command: ICEGRID_OBJECT ICEGRID_REMOVE ICEGRID_HELP ';'  */
-#line 552 "src/IceGrid/Grammar.y"
+#line 550 "src/IceGrid/Grammar.y"
 {
     parser->usage("object", "remove");
 }
@@ -2635,7 +2635,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 105: /* command: ICEGRID_OBJECT ICEGRID_FIND strings ';'  */
-#line 556 "src/IceGrid/Grammar.y"
+#line 554 "src/IceGrid/Grammar.y"
 {
     parser->findObject(yyvsp[-1]);
 }
@@ -2643,7 +2643,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 106: /* command: ICEGRID_OBJECT ICEGRID_FIND ICEGRID_HELP ';'  */
-#line 560 "src/IceGrid/Grammar.y"
+#line 558 "src/IceGrid/Grammar.y"
 {
     parser->usage("object", "find");
 }
@@ -2651,7 +2651,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 107: /* command: ICEGRID_OBJECT ICEGRID_LIST strings ';'  */
-#line 564 "src/IceGrid/Grammar.y"
+#line 562 "src/IceGrid/Grammar.y"
 {
     parser->listObject(yyvsp[-1]);
 }
@@ -2659,7 +2659,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 108: /* command: ICEGRID_OBJECT ICEGRID_LIST ICEGRID_HELP ';'  */
-#line 568 "src/IceGrid/Grammar.y"
+#line 566 "src/IceGrid/Grammar.y"
 {
     parser->usage("object", "list");
 }
@@ -2667,7 +2667,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 109: /* command: ICEGRID_OBJECT ICEGRID_DESCRIBE strings ';'  */
-#line 572 "src/IceGrid/Grammar.y"
+#line 570 "src/IceGrid/Grammar.y"
 {
     parser->describeObject(yyvsp[-1]);
 }
@@ -2675,7 +2675,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 110: /* command: ICEGRID_OBJECT ICEGRID_DESCRIBE ICEGRID_HELP ';'  */
-#line 576 "src/IceGrid/Grammar.y"
+#line 574 "src/IceGrid/Grammar.y"
 {
     parser->usage("object", "describe");
 }
@@ -2683,7 +2683,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 111: /* command: ICEGRID_SHOW ICEGRID_COPYING ';'  */
-#line 580 "src/IceGrid/Grammar.y"
+#line 578 "src/IceGrid/Grammar.y"
 {
     parser->showCopying();
 }
@@ -2691,7 +2691,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 112: /* command: ICEGRID_SHOW ICEGRID_WARRANTY ';'  */
-#line 584 "src/IceGrid/Grammar.y"
+#line 582 "src/IceGrid/Grammar.y"
 {
     parser->showWarranty();
 }
@@ -2699,7 +2699,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 113: /* command: ICEGRID_HELP keyword ';'  */
-#line 588 "src/IceGrid/Grammar.y"
+#line 586 "src/IceGrid/Grammar.y"
 {
     parser->usage(yyvsp[-1].front());
 }
@@ -2707,7 +2707,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 114: /* command: ICEGRID_HELP keyword keyword ';'  */
-#line 592 "src/IceGrid/Grammar.y"
+#line 590 "src/IceGrid/Grammar.y"
 {
     if ((yyvsp[-2].front() == "server" || yyvsp[-2].front() == "service") && yyvsp[-1].front() == "template")
     {
@@ -2722,7 +2722,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 115: /* command: ICEGRID_HELP keyword ICEGRID_STRING strings ';'  */
-#line 603 "src/IceGrid/Grammar.y"
+#line 601 "src/IceGrid/Grammar.y"
 {
     parser->usage(yyvsp[-3].front(), yyvsp[-2].front());
 }
@@ -2730,7 +2730,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 116: /* command: ICEGRID_HELP keyword keyword keyword ';'  */
-#line 607 "src/IceGrid/Grammar.y"
+#line 605 "src/IceGrid/Grammar.y"
 {
     if ((yyvsp[-3].front() == "server" || yyvsp[-3].front() == "service") && yyvsp[-2].front() == "template")
     {
@@ -2745,7 +2745,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 117: /* command: ICEGRID_HELP keyword keyword ICEGRID_STRING strings ';'  */
-#line 618 "src/IceGrid/Grammar.y"
+#line 616 "src/IceGrid/Grammar.y"
 {
     if ((yyvsp[-4].front() == "server" || yyvsp[-4].front() == "service") && yyvsp[-3].front() == "template")
     {
@@ -2760,7 +2760,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 118: /* command: ICEGRID_HELP ICEGRID_STRING strings ';'  */
-#line 629 "src/IceGrid/Grammar.y"
+#line 627 "src/IceGrid/Grammar.y"
 {
     parser->usage(yyvsp[-2].front());
 }
@@ -2768,7 +2768,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 119: /* command: ICEGRID_HELP error ';'  */
-#line 633 "src/IceGrid/Grammar.y"
+#line 631 "src/IceGrid/Grammar.y"
 {
     parser->usage();
 }
@@ -2776,7 +2776,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 120: /* command: keyword ICEGRID_HELP ';'  */
-#line 637 "src/IceGrid/Grammar.y"
+#line 635 "src/IceGrid/Grammar.y"
 {
     parser->usage(yyvsp[-2].front());
 }
@@ -2784,7 +2784,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 121: /* command: keyword ICEGRID_STRING error ';'  */
-#line 641 "src/IceGrid/Grammar.y"
+#line 639 "src/IceGrid/Grammar.y"
 {
     yyvsp[-3].push_back(yyvsp[-2].front());
     parser->invalidCommand(yyvsp[-3]);
@@ -2794,7 +2794,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 122: /* command: keyword error ';'  */
-#line 647 "src/IceGrid/Grammar.y"
+#line 645 "src/IceGrid/Grammar.y"
 {
     parser->invalidCommand(yyvsp[-2]);
     yyerrok;
@@ -2803,7 +2803,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 123: /* command: ICEGRID_STRING error ';'  */
-#line 652 "src/IceGrid/Grammar.y"
+#line 650 "src/IceGrid/Grammar.y"
 {
     parser->invalidCommand(yyvsp[-2]);
     yyerrok;
@@ -2812,7 +2812,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 124: /* command: error ';'  */
-#line 657 "src/IceGrid/Grammar.y"
+#line 655 "src/IceGrid/Grammar.y"
 {
     yyerrok;
 }
@@ -2820,14 +2820,14 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 125: /* command: ';'  */
-#line 661 "src/IceGrid/Grammar.y"
+#line 659 "src/IceGrid/Grammar.y"
 {
 }
 #line 2827 "src/IceGrid/Grammar.cpp"
     break;
 
   case 126: /* strings: ICEGRID_STRING strings  */
-#line 669 "src/IceGrid/Grammar.y"
+#line 667 "src/IceGrid/Grammar.y"
 {
     yyval = yyvsp[0];
     yyval.push_front(yyvsp[-1].front());
@@ -2836,7 +2836,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 127: /* strings: keyword strings  */
-#line 674 "src/IceGrid/Grammar.y"
+#line 672 "src/IceGrid/Grammar.y"
 {
     yyval = yyvsp[0];
     yyval.push_front(yyvsp[-1].front());
@@ -2845,7 +2845,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 128: /* strings: ICEGRID_STRING ICEGRID_HELP strings  */
-#line 679 "src/IceGrid/Grammar.y"
+#line 677 "src/IceGrid/Grammar.y"
 {
     yyval = yyvsp[-1];
     yyval.push_front("help");
@@ -2855,7 +2855,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 129: /* strings: keyword ICEGRID_HELP strings  */
-#line 685 "src/IceGrid/Grammar.y"
+#line 683 "src/IceGrid/Grammar.y"
 {
     yyval = yyvsp[-1];
     yyval.push_front("help");
@@ -2865,7 +2865,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 130: /* strings: %empty  */
-#line 691 "src/IceGrid/Grammar.y"
+#line 689 "src/IceGrid/Grammar.y"
 {
     yyval = YYSTYPE();
 }
@@ -2873,259 +2873,259 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 131: /* keyword: ICEGRID_EXIT  */
-#line 700 "src/IceGrid/Grammar.y"
+#line 698 "src/IceGrid/Grammar.y"
 {
 }
 #line 2880 "src/IceGrid/Grammar.cpp"
     break;
 
   case 132: /* keyword: ICEGRID_APPLICATION  */
-#line 703 "src/IceGrid/Grammar.y"
+#line 701 "src/IceGrid/Grammar.y"
 {
 }
 #line 2887 "src/IceGrid/Grammar.cpp"
     break;
 
   case 133: /* keyword: ICEGRID_NODE  */
-#line 706 "src/IceGrid/Grammar.y"
+#line 704 "src/IceGrid/Grammar.y"
 {
 }
 #line 2894 "src/IceGrid/Grammar.cpp"
     break;
 
   case 134: /* keyword: ICEGRID_REGISTRY  */
-#line 709 "src/IceGrid/Grammar.y"
+#line 707 "src/IceGrid/Grammar.y"
 {
 }
 #line 2901 "src/IceGrid/Grammar.cpp"
     break;
 
   case 135: /* keyword: ICEGRID_SERVER  */
-#line 712 "src/IceGrid/Grammar.y"
+#line 710 "src/IceGrid/Grammar.y"
 {
 }
 #line 2908 "src/IceGrid/Grammar.cpp"
     break;
 
   case 136: /* keyword: ICEGRID_ADAPTER  */
-#line 715 "src/IceGrid/Grammar.y"
+#line 713 "src/IceGrid/Grammar.y"
 {
 }
 #line 2915 "src/IceGrid/Grammar.cpp"
     break;
 
   case 137: /* keyword: ICEGRID_PING  */
-#line 718 "src/IceGrid/Grammar.y"
+#line 716 "src/IceGrid/Grammar.y"
 {
 }
 #line 2922 "src/IceGrid/Grammar.cpp"
     break;
 
   case 138: /* keyword: ICEGRID_LOAD  */
-#line 721 "src/IceGrid/Grammar.y"
+#line 719 "src/IceGrid/Grammar.y"
 {
 }
 #line 2929 "src/IceGrid/Grammar.cpp"
     break;
 
   case 139: /* keyword: ICEGRID_SOCKETS  */
-#line 724 "src/IceGrid/Grammar.y"
+#line 722 "src/IceGrid/Grammar.y"
 {
 }
 #line 2936 "src/IceGrid/Grammar.cpp"
     break;
 
   case 140: /* keyword: ICEGRID_ADD  */
-#line 727 "src/IceGrid/Grammar.y"
+#line 725 "src/IceGrid/Grammar.y"
 {
 }
 #line 2943 "src/IceGrid/Grammar.cpp"
     break;
 
   case 141: /* keyword: ICEGRID_REMOVE  */
-#line 730 "src/IceGrid/Grammar.y"
+#line 728 "src/IceGrid/Grammar.y"
 {
 }
 #line 2950 "src/IceGrid/Grammar.cpp"
     break;
 
   case 142: /* keyword: ICEGRID_LIST  */
-#line 733 "src/IceGrid/Grammar.y"
+#line 731 "src/IceGrid/Grammar.y"
 {
 }
 #line 2957 "src/IceGrid/Grammar.cpp"
     break;
 
   case 143: /* keyword: ICEGRID_SHUTDOWN  */
-#line 736 "src/IceGrid/Grammar.y"
+#line 734 "src/IceGrid/Grammar.y"
 {
 }
 #line 2964 "src/IceGrid/Grammar.cpp"
     break;
 
   case 144: /* keyword: ICEGRID_START  */
-#line 739 "src/IceGrid/Grammar.y"
+#line 737 "src/IceGrid/Grammar.y"
 {
 }
 #line 2971 "src/IceGrid/Grammar.cpp"
     break;
 
   case 145: /* keyword: ICEGRID_STOP  */
-#line 742 "src/IceGrid/Grammar.y"
+#line 740 "src/IceGrid/Grammar.y"
 {
 }
 #line 2978 "src/IceGrid/Grammar.cpp"
     break;
 
   case 146: /* keyword: ICEGRID_SIGNAL  */
-#line 745 "src/IceGrid/Grammar.y"
+#line 743 "src/IceGrid/Grammar.y"
 {
 }
 #line 2985 "src/IceGrid/Grammar.cpp"
     break;
 
   case 147: /* keyword: ICEGRID_DESCRIBE  */
-#line 748 "src/IceGrid/Grammar.y"
+#line 746 "src/IceGrid/Grammar.y"
 {
 }
 #line 2992 "src/IceGrid/Grammar.cpp"
     break;
 
   case 148: /* keyword: ICEGRID_STATE  */
-#line 751 "src/IceGrid/Grammar.y"
+#line 749 "src/IceGrid/Grammar.y"
 {
 }
 #line 2999 "src/IceGrid/Grammar.cpp"
     break;
 
   case 149: /* keyword: ICEGRID_PID  */
-#line 754 "src/IceGrid/Grammar.y"
+#line 752 "src/IceGrid/Grammar.y"
 {
 }
 #line 3006 "src/IceGrid/Grammar.cpp"
     break;
 
   case 150: /* keyword: ICEGRID_PROPERTIES  */
-#line 757 "src/IceGrid/Grammar.y"
+#line 755 "src/IceGrid/Grammar.y"
 {
 }
 #line 3013 "src/IceGrid/Grammar.cpp"
     break;
 
   case 151: /* keyword: ICEGRID_PROPERTY  */
-#line 760 "src/IceGrid/Grammar.y"
+#line 758 "src/IceGrid/Grammar.y"
 {
 }
 #line 3020 "src/IceGrid/Grammar.cpp"
     break;
 
   case 152: /* keyword: ICEGRID_ENDPOINTS  */
-#line 763 "src/IceGrid/Grammar.y"
+#line 761 "src/IceGrid/Grammar.y"
 {
 }
 #line 3027 "src/IceGrid/Grammar.cpp"
     break;
 
   case 153: /* keyword: ICEGRID_ACTIVATION  */
-#line 766 "src/IceGrid/Grammar.y"
+#line 764 "src/IceGrid/Grammar.y"
 {
 }
 #line 3034 "src/IceGrid/Grammar.cpp"
     break;
 
   case 154: /* keyword: ICEGRID_OBJECT  */
-#line 769 "src/IceGrid/Grammar.y"
+#line 767 "src/IceGrid/Grammar.y"
 {
 }
 #line 3041 "src/IceGrid/Grammar.cpp"
     break;
 
   case 155: /* keyword: ICEGRID_FIND  */
-#line 772 "src/IceGrid/Grammar.y"
+#line 770 "src/IceGrid/Grammar.y"
 {
 }
 #line 3048 "src/IceGrid/Grammar.cpp"
     break;
 
   case 156: /* keyword: ICEGRID_SHOW  */
-#line 775 "src/IceGrid/Grammar.y"
+#line 773 "src/IceGrid/Grammar.y"
 {
 }
 #line 3055 "src/IceGrid/Grammar.cpp"
     break;
 
   case 157: /* keyword: ICEGRID_COPYING  */
-#line 778 "src/IceGrid/Grammar.y"
+#line 776 "src/IceGrid/Grammar.y"
 {
 }
 #line 3062 "src/IceGrid/Grammar.cpp"
     break;
 
   case 158: /* keyword: ICEGRID_WARRANTY  */
-#line 781 "src/IceGrid/Grammar.y"
+#line 779 "src/IceGrid/Grammar.y"
 {
 }
 #line 3069 "src/IceGrid/Grammar.cpp"
     break;
 
   case 159: /* keyword: ICEGRID_DIFF  */
-#line 784 "src/IceGrid/Grammar.y"
+#line 782 "src/IceGrid/Grammar.y"
 {
 }
 #line 3076 "src/IceGrid/Grammar.cpp"
     break;
 
   case 160: /* keyword: ICEGRID_UPDATE  */
-#line 787 "src/IceGrid/Grammar.y"
+#line 785 "src/IceGrid/Grammar.y"
 {
 }
 #line 3083 "src/IceGrid/Grammar.cpp"
     break;
 
   case 161: /* keyword: ICEGRID_INSTANTIATE  */
-#line 790 "src/IceGrid/Grammar.y"
+#line 788 "src/IceGrid/Grammar.y"
 {
 }
 #line 3090 "src/IceGrid/Grammar.cpp"
     break;
 
   case 162: /* keyword: ICEGRID_TEMPLATE  */
-#line 793 "src/IceGrid/Grammar.y"
+#line 791 "src/IceGrid/Grammar.y"
 {
 }
 #line 3097 "src/IceGrid/Grammar.cpp"
     break;
 
   case 163: /* keyword: ICEGRID_SERVICE  */
-#line 796 "src/IceGrid/Grammar.y"
+#line 794 "src/IceGrid/Grammar.y"
 {
 }
 #line 3104 "src/IceGrid/Grammar.cpp"
     break;
 
   case 164: /* keyword: ICEGRID_ENABLE  */
-#line 799 "src/IceGrid/Grammar.y"
+#line 797 "src/IceGrid/Grammar.y"
 {
 }
 #line 3111 "src/IceGrid/Grammar.cpp"
     break;
 
   case 165: /* keyword: ICEGRID_DISABLE  */
-#line 802 "src/IceGrid/Grammar.y"
+#line 800 "src/IceGrid/Grammar.y"
 {
 }
 #line 3118 "src/IceGrid/Grammar.cpp"
     break;
 
   case 166: /* keyword: ICEGRID_STDERR  */
-#line 805 "src/IceGrid/Grammar.y"
+#line 803 "src/IceGrid/Grammar.y"
 {
 }
 #line 3125 "src/IceGrid/Grammar.cpp"
     break;
 
   case 167: /* keyword: ICEGRID_STDOUT  */
-#line 808 "src/IceGrid/Grammar.y"
+#line 806 "src/IceGrid/Grammar.y"
 {
 }
 #line 3132 "src/IceGrid/Grammar.cpp"
@@ -3325,3 +3325,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
   return yyresult;
 }
 
+#line 810 "src/IceGrid/Grammar.y"
+
+
+// NOLINTEND
diff --git a/cpp/src/IceGrid/Grammar.h b/cpp/src/IceGrid/Grammar.h
index 6dc5ff9af8e..2b25d2ee4b6 100644
--- a/cpp/src/IceGrid/Grammar.h
+++ b/cpp/src/IceGrid/Grammar.h
@@ -48,8 +48,6 @@ extern int yydebug;
 #line 9 "src/IceGrid/Grammar.y"
 
 
-// NOLINTBEGIN
-
 #include <list>
 #include <string>
 
@@ -65,7 +63,7 @@ extern int yydebug;
 #define yyoverflow(a, b, c, d, e, f) yyerror(a)
 
 
-#line 69 "src/IceGrid/Grammar.h"
+#line 67 "src/IceGrid/Grammar.h"
 
 /* Token kinds.  */
 #ifndef YYTOKENTYPE
diff --git a/cpp/src/IceGrid/Grammar.y b/cpp/src/IceGrid/Grammar.y
index 47912be949a..c63942b5ab0 100644
--- a/cpp/src/IceGrid/Grammar.y
+++ b/cpp/src/IceGrid/Grammar.y
@@ -8,8 +8,6 @@
 
 %code requires{
 
-// NOLINTBEGIN
-
 #include <list>
 #include <string>
 
@@ -808,3 +806,7 @@ keyword
 {
 }
 ;
+
+%%
+
+// NOLINTEND
diff --git a/cpp/src/IceStorm/Grammar.cpp b/cpp/src/IceStorm/Grammar.cpp
index 9ff13e83e32..9366289b9c6 100644
--- a/cpp/src/IceStorm/Grammar.cpp
+++ b/cpp/src/IceStorm/Grammar.cpp
@@ -77,7 +77,7 @@
 
 
 /* First part of user prologue.  */
-#line 37 "src/IceStorm/Grammar.y"
+#line 35 "src/IceStorm/Grammar.y"
 
 
 #include "Ice/Ice.h"
@@ -169,7 +169,7 @@ typedef enum yysymbol_kind_t yysymbol_kind_t;
 
 
 /* Unqualified %code blocks.  */
-#line 29 "src/IceStorm/Grammar.y"
+#line 27 "src/IceStorm/Grammar.y"
 
 
 // Forward declaration of the lexing function generated by flex, so bison knows about it.
@@ -559,10 +559,10 @@ static const yytype_int8 yytranslate[] =
 /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint8 yyrline[] =
 {
-       0,    99,    99,   102,   110,   113,   121,   125,   129,   133,
-     137,   141,   145,   149,   153,   157,   161,   165,   169,   173,
-     181,   186,   191,   200,   203,   206,   209,   212,   215,   218,
-     221,   224
+       0,    97,    97,   100,   108,   111,   119,   123,   127,   131,
+     135,   139,   143,   147,   151,   155,   159,   163,   167,   171,
+     179,   184,   189,   198,   201,   204,   207,   210,   213,   216,
+     219,   222
 };
 #endif
 
@@ -1162,35 +1162,35 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
   switch (yyn)
     {
   case 2: /* start: commands  */
-#line 100 "src/IceStorm/Grammar.y"
+#line 98 "src/IceStorm/Grammar.y"
 {
 }
 #line 1169 "src/IceStorm/Grammar.cpp"
     break;
 
   case 3: /* start: %empty  */
-#line 103 "src/IceStorm/Grammar.y"
+#line 101 "src/IceStorm/Grammar.y"
 {
 }
 #line 1176 "src/IceStorm/Grammar.cpp"
     break;
 
   case 4: /* commands: commands command  */
-#line 111 "src/IceStorm/Grammar.y"
+#line 109 "src/IceStorm/Grammar.y"
 {
 }
 #line 1183 "src/IceStorm/Grammar.cpp"
     break;
 
   case 5: /* commands: command  */
-#line 114 "src/IceStorm/Grammar.y"
+#line 112 "src/IceStorm/Grammar.y"
 {
 }
 #line 1190 "src/IceStorm/Grammar.cpp"
     break;
 
   case 6: /* command: ICESTORM_HELP ';'  */
-#line 122 "src/IceStorm/Grammar.y"
+#line 120 "src/IceStorm/Grammar.y"
 {
     parser->usage();
 }
@@ -1198,7 +1198,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 7: /* command: ICESTORM_EXIT ';'  */
-#line 126 "src/IceStorm/Grammar.y"
+#line 124 "src/IceStorm/Grammar.y"
 {
     return 0;
 }
@@ -1206,7 +1206,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 8: /* command: ICESTORM_CREATE strings ';'  */
-#line 130 "src/IceStorm/Grammar.y"
+#line 128 "src/IceStorm/Grammar.y"
 {
     parser->create(yyvsp[-1]);
 }
@@ -1214,7 +1214,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 9: /* command: ICESTORM_CURRENT strings ';'  */
-#line 134 "src/IceStorm/Grammar.y"
+#line 132 "src/IceStorm/Grammar.y"
 {
     parser->current(yyvsp[-1]);
 }
@@ -1222,7 +1222,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 10: /* command: ICESTORM_DESTROY strings ';'  */
-#line 138 "src/IceStorm/Grammar.y"
+#line 136 "src/IceStorm/Grammar.y"
 {
     parser->destroy(yyvsp[-1]);
 }
@@ -1230,7 +1230,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 11: /* command: ICESTORM_LINK strings ';'  */
-#line 142 "src/IceStorm/Grammar.y"
+#line 140 "src/IceStorm/Grammar.y"
 {
     parser->link(yyvsp[-1]);
 }
@@ -1238,7 +1238,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 12: /* command: ICESTORM_UNLINK strings ';'  */
-#line 146 "src/IceStorm/Grammar.y"
+#line 144 "src/IceStorm/Grammar.y"
 {
     parser->unlink(yyvsp[-1]);
 }
@@ -1246,7 +1246,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 13: /* command: ICESTORM_LINKS strings ';'  */
-#line 150 "src/IceStorm/Grammar.y"
+#line 148 "src/IceStorm/Grammar.y"
 {
     parser->links(yyvsp[-1]);
 }
@@ -1254,7 +1254,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 14: /* command: ICESTORM_TOPICS strings ';'  */
-#line 154 "src/IceStorm/Grammar.y"
+#line 152 "src/IceStorm/Grammar.y"
 {
     parser->topics(yyvsp[-1]);
 }
@@ -1262,7 +1262,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 15: /* command: ICESTORM_REPLICA strings ';'  */
-#line 158 "src/IceStorm/Grammar.y"
+#line 156 "src/IceStorm/Grammar.y"
 {
     parser->replica(yyvsp[-1]);
 }
@@ -1270,7 +1270,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 16: /* command: ICESTORM_SUBSCRIBERS strings ';'  */
-#line 162 "src/IceStorm/Grammar.y"
+#line 160 "src/IceStorm/Grammar.y"
 {
     parser->subscribers(yyvsp[-1]);
 }
@@ -1278,7 +1278,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 17: /* command: ICESTORM_STRING error ';'  */
-#line 166 "src/IceStorm/Grammar.y"
+#line 164 "src/IceStorm/Grammar.y"
 {
     parser->invalidCommand("unknown command `" + yyvsp[-2].front() + "' (type `help' for more info)");
 }
@@ -1286,7 +1286,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 18: /* command: error ';'  */
-#line 170 "src/IceStorm/Grammar.y"
+#line 168 "src/IceStorm/Grammar.y"
 {
     yyerrok;
 }
@@ -1294,14 +1294,14 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 19: /* command: ';'  */
-#line 174 "src/IceStorm/Grammar.y"
+#line 172 "src/IceStorm/Grammar.y"
 {
 }
 #line 1301 "src/IceStorm/Grammar.cpp"
     break;
 
   case 20: /* strings: ICESTORM_STRING strings  */
-#line 182 "src/IceStorm/Grammar.y"
+#line 180 "src/IceStorm/Grammar.y"
 {
     yyval = yyvsp[0];
     yyval.push_front(yyvsp[-1].front());
@@ -1310,7 +1310,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 21: /* strings: keyword strings  */
-#line 187 "src/IceStorm/Grammar.y"
+#line 185 "src/IceStorm/Grammar.y"
 {
     yyval = yyvsp[0];
     yyval.push_front(yyvsp[-1].front());
@@ -1319,7 +1319,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 22: /* strings: %empty  */
-#line 192 "src/IceStorm/Grammar.y"
+#line 190 "src/IceStorm/Grammar.y"
 {
     yyval = YYSTYPE();
 }
@@ -1327,63 +1327,63 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
     break;
 
   case 23: /* keyword: ICESTORM_HELP  */
-#line 201 "src/IceStorm/Grammar.y"
+#line 199 "src/IceStorm/Grammar.y"
 {
 }
 #line 1334 "src/IceStorm/Grammar.cpp"
     break;
 
   case 24: /* keyword: ICESTORM_EXIT  */
-#line 204 "src/IceStorm/Grammar.y"
+#line 202 "src/IceStorm/Grammar.y"
 {
 }
 #line 1341 "src/IceStorm/Grammar.cpp"
     break;
 
   case 25: /* keyword: ICESTORM_CURRENT  */
-#line 207 "src/IceStorm/Grammar.y"
+#line 205 "src/IceStorm/Grammar.y"
 {
 }
 #line 1348 "src/IceStorm/Grammar.cpp"
     break;
 
   case 26: /* keyword: ICESTORM_CREATE  */
-#line 210 "src/IceStorm/Grammar.y"
+#line 208 "src/IceStorm/Grammar.y"
 {
 }
 #line 1355 "src/IceStorm/Grammar.cpp"
     break;
 
   case 27: /* keyword: ICESTORM_DESTROY  */
-#line 213 "src/IceStorm/Grammar.y"
+#line 211 "src/IceStorm/Grammar.y"
 {
 }
 #line 1362 "src/IceStorm/Grammar.cpp"
     break;
 
   case 28: /* keyword: ICESTORM_LINK  */
-#line 216 "src/IceStorm/Grammar.y"
+#line 214 "src/IceStorm/Grammar.y"
 {
 }
 #line 1369 "src/IceStorm/Grammar.cpp"
     break;
 
   case 29: /* keyword: ICESTORM_UNLINK  */
-#line 219 "src/IceStorm/Grammar.y"
+#line 217 "src/IceStorm/Grammar.y"
 {
 }
 #line 1376 "src/IceStorm/Grammar.cpp"
     break;
 
   case 30: /* keyword: ICESTORM_LINKS  */
-#line 222 "src/IceStorm/Grammar.y"
+#line 220 "src/IceStorm/Grammar.y"
 {
 }
 #line 1383 "src/IceStorm/Grammar.cpp"
     break;
 
   case 31: /* keyword: ICESTORM_TOPICS  */
-#line 225 "src/IceStorm/Grammar.y"
+#line 223 "src/IceStorm/Grammar.y"
 {
 }
 #line 1390 "src/IceStorm/Grammar.cpp"
@@ -1583,5 +1583,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
   return yyresult;
 }
 
-#line 228 "src/IceStorm/Grammar.y"
+#line 226 "src/IceStorm/Grammar.y"
 
+
+// NOLINTEND
diff --git a/cpp/src/IceStorm/Grammar.h b/cpp/src/IceStorm/Grammar.h
index 288fd97f76b..1e15679de6f 100644
--- a/cpp/src/IceStorm/Grammar.h
+++ b/cpp/src/IceStorm/Grammar.h
@@ -48,8 +48,6 @@ extern int yydebug;
 #line 9 "src/IceStorm/Grammar.y"
 
 
-// NOLINTBEGIN
-
 #include <list>
 #include <string>
 
@@ -65,7 +63,7 @@ extern int yydebug;
 #define yyoverflow(a, b, c, d, e, f) yyerror(a)
 
 
-#line 69 "src/IceStorm/Grammar.h"
+#line 67 "src/IceStorm/Grammar.h"
 
 /* Token kinds.  */
 #ifndef YYTOKENTYPE
diff --git a/cpp/src/IceStorm/Grammar.y b/cpp/src/IceStorm/Grammar.y
index ff6c6c48a38..45159f4cb80 100644
--- a/cpp/src/IceStorm/Grammar.y
+++ b/cpp/src/IceStorm/Grammar.y
@@ -8,8 +8,6 @@
 
 %code requires{
 
-// NOLINTBEGIN
-
 #include <list>
 #include <string>
 
@@ -226,3 +224,5 @@ keyword
 }
 
 %%
+
+// NOLINTEND
diff --git a/cpp/src/Slice/Grammar.cpp b/cpp/src/Slice/Grammar.cpp
index da8657b40f3..bc78b9d8d92 100644
--- a/cpp/src/Slice/Grammar.cpp
+++ b/cpp/src/Slice/Grammar.cpp
@@ -71,7 +71,7 @@
 
 // NOLINTBEGIN
 
-#line 29 "src/Slice/Grammar.y"
+#line 27 "src/Slice/Grammar.y"
 
 
 // Defines the rule bison uses to reduce token locations. Bison asks that the macro should
@@ -112,7 +112,7 @@ while(0)
 #define yynerrs         slice_nerrs
 
 /* First part of user prologue.  */
-#line 68 "src/Slice/Grammar.y"
+#line 66 "src/Slice/Grammar.y"
 
 
 #include "Ice/UUID.h"
@@ -332,7 +332,7 @@ typedef enum yysymbol_kind_t yysymbol_kind_t;
 
 
 /* Unqualified %code blocks.  */
-#line 60 "src/Slice/Grammar.y"
+#line 58 "src/Slice/Grammar.y"
 
 
 // Forward declaration of the lexing function generated by flex, so bison knows about it.
@@ -728,27 +728,27 @@ static const yytype_int8 yytranslate[] =
 /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_int16 yyrline[] =
 {
-       0,   186,   186,   194,   197,   205,   214,   218,   227,   235,
-     244,   253,   252,   258,   257,   262,   267,   266,   272,   271,
-     276,   281,   280,   286,   285,   290,   295,   294,   300,   299,
-     304,   309,   308,   314,   313,   318,   323,   322,   327,   332,
-     331,   337,   336,   341,   345,   355,   354,   385,   384,   468,
-     472,   483,   494,   493,   519,   527,   536,   547,   565,   640,
-     646,   657,   674,   687,   691,   702,   713,   712,   751,   755,
-     766,   791,   878,   890,   903,   902,   936,   970,   979,   982,
-     990,   999,  1002,  1006,  1014,  1044,  1075,  1097,  1123,  1138,
-    1144,  1154,  1178,  1208,  1232,  1267,  1266,  1289,  1288,  1311,
-    1315,  1326,  1340,  1339,  1373,  1408,  1443,  1448,  1458,  1462,
-    1471,  1480,  1483,  1487,  1495,  1502,  1514,  1526,  1537,  1545,
-    1559,  1569,  1585,  1589,  1601,  1600,  1632,  1631,  1649,  1661,
-    1673,  1682,  1688,  1706,  1718,  1722,  1763,  1769,  1780,  1783,
-    1799,  1815,  1827,  1839,  1850,  1866,  1870,  1879,  1882,  1890,
-    1891,  1892,  1893,  1894,  1895,  1896,  1897,  1898,  1899,  1904,
-    1908,  1913,  1938,  1968,  1974,  1982,  1992,  2007,  2016,  2025,
-    2060,  2067,  2074,  2086,  2095,  2109,  2110,  2111,  2112,  2113,
-    2114,  2115,  2116,  2117,  2118,  2119,  2120,  2121,  2122,  2123,
-    2124,  2125,  2126,  2127,  2128,  2129,  2130,  2131,  2132,  2133,
-    2134,  2135
+       0,   184,   184,   192,   195,   203,   212,   216,   225,   233,
+     242,   251,   250,   256,   255,   260,   265,   264,   270,   269,
+     274,   279,   278,   284,   283,   288,   293,   292,   298,   297,
+     302,   307,   306,   312,   311,   316,   321,   320,   325,   330,
+     329,   335,   334,   339,   343,   353,   352,   383,   382,   466,
+     470,   481,   492,   491,   517,   525,   534,   545,   563,   638,
+     644,   655,   672,   685,   689,   700,   711,   710,   749,   753,
+     764,   789,   876,   888,   901,   900,   934,   968,   977,   980,
+     988,   997,  1000,  1004,  1012,  1042,  1073,  1095,  1121,  1136,
+    1142,  1152,  1176,  1206,  1230,  1265,  1264,  1287,  1286,  1309,
+    1313,  1324,  1338,  1337,  1371,  1406,  1441,  1446,  1456,  1460,
+    1469,  1478,  1481,  1485,  1493,  1500,  1512,  1524,  1535,  1543,
+    1557,  1567,  1583,  1587,  1599,  1598,  1630,  1629,  1647,  1659,
+    1671,  1680,  1686,  1704,  1716,  1720,  1761,  1767,  1778,  1781,
+    1797,  1813,  1825,  1837,  1848,  1864,  1868,  1877,  1880,  1888,
+    1889,  1890,  1891,  1892,  1893,  1894,  1895,  1896,  1897,  1902,
+    1906,  1911,  1936,  1966,  1972,  1980,  1990,  2005,  2014,  2023,
+    2058,  2065,  2072,  2084,  2093,  2107,  2108,  2109,  2110,  2111,
+    2112,  2113,  2114,  2115,  2116,  2117,  2118,  2119,  2120,  2121,
+    2122,  2123,  2124,  2125,  2126,  2127,  2128,  2129,  2130,  2131,
+    2132,  2133
 };
 #endif
 
@@ -1730,28 +1730,28 @@ YYLTYPE yylloc = yyloc_default;
   switch (yyn)
     {
   case 2: /* start: definitions  */
-#line 187 "src/Slice/Grammar.y"
+#line 185 "src/Slice/Grammar.y"
 {
 }
 #line 1737 "src/Slice/Grammar.cpp"
     break;
 
   case 3: /* opt_semicolon: ';'  */
-#line 195 "src/Slice/Grammar.y"
+#line 193 "src/Slice/Grammar.y"
 {
 }
 #line 1744 "src/Slice/Grammar.cpp"
     break;
 
   case 4: /* opt_semicolon: %empty  */
-#line 198 "src/Slice/Grammar.y"
+#line 196 "src/Slice/Grammar.y"
 {
 }
 #line 1751 "src/Slice/Grammar.cpp"
     break;
 
   case 5: /* file_metadata: ICE_FILE_METADATA_OPEN metadata_list ICE_FILE_METADATA_CLOSE  */
-#line 206 "src/Slice/Grammar.y"
+#line 204 "src/Slice/Grammar.y"
 {
     yyval = yyvsp[-1];
 }
@@ -1759,7 +1759,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 6: /* metadata: ICE_METADATA_OPEN metadata_list ICE_METADATA_CLOSE  */
-#line 215 "src/Slice/Grammar.y"
+#line 213 "src/Slice/Grammar.y"
 {
     yyval = yyvsp[-1];
 }
@@ -1767,7 +1767,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 7: /* metadata: %empty  */
-#line 219 "src/Slice/Grammar.y"
+#line 217 "src/Slice/Grammar.y"
 {
     yyval = make_shared<MetadataListTok>();
 }
@@ -1775,7 +1775,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 8: /* definitions: definitions file_metadata  */
-#line 228 "src/Slice/Grammar.y"
+#line 226 "src/Slice/Grammar.y"
 {
     auto metadata = dynamic_pointer_cast<MetadataListTok>(yyvsp[0]);
     if (!metadata->v.empty())
@@ -1787,7 +1787,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 9: /* definitions: definitions metadata definition  */
-#line 236 "src/Slice/Grammar.y"
+#line 234 "src/Slice/Grammar.y"
 {
     auto metadata = dynamic_pointer_cast<MetadataListTok>(yyvsp[-1]);
     auto contained = dynamic_pointer_cast<Contained>(yyvsp[0]);
@@ -1800,14 +1800,14 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 10: /* definitions: %empty  */
-#line 245 "src/Slice/Grammar.y"
+#line 243 "src/Slice/Grammar.y"
 {
 }
 #line 1807 "src/Slice/Grammar.cpp"
     break;
 
   case 11: /* $@1: %empty  */
-#line 253 "src/Slice/Grammar.y"
+#line 251 "src/Slice/Grammar.y"
 {
     assert(yyvsp[0] == nullptr || dynamic_pointer_cast<Module>(yyvsp[0]));
 }
@@ -1815,7 +1815,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 13: /* $@2: %empty  */
-#line 258 "src/Slice/Grammar.y"
+#line 256 "src/Slice/Grammar.y"
 {
     assert(yyvsp[0] == nullptr || dynamic_pointer_cast<ClassDecl>(yyvsp[0]));
 }
@@ -1823,7 +1823,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 15: /* definition: class_decl  */
-#line 263 "src/Slice/Grammar.y"
+#line 261 "src/Slice/Grammar.y"
 {
     currentUnit->error("`;' missing after class forward declaration");
 }
@@ -1831,7 +1831,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 16: /* $@3: %empty  */
-#line 267 "src/Slice/Grammar.y"
+#line 265 "src/Slice/Grammar.y"
 {
     assert(yyvsp[0] == nullptr || dynamic_pointer_cast<ClassDef>(yyvsp[0]));
 }
@@ -1839,7 +1839,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 18: /* $@4: %empty  */
-#line 272 "src/Slice/Grammar.y"
+#line 270 "src/Slice/Grammar.y"
 {
     assert(yyvsp[0] == nullptr || dynamic_pointer_cast<InterfaceDecl>(yyvsp[0]));
 }
@@ -1847,7 +1847,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 20: /* definition: interface_decl  */
-#line 277 "src/Slice/Grammar.y"
+#line 275 "src/Slice/Grammar.y"
 {
     currentUnit->error("`;' missing after interface forward declaration");
 }
@@ -1855,7 +1855,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 21: /* $@5: %empty  */
-#line 281 "src/Slice/Grammar.y"
+#line 279 "src/Slice/Grammar.y"
 {
     assert(yyvsp[0] == nullptr || dynamic_pointer_cast<InterfaceDef>(yyvsp[0]));
 }
@@ -1863,7 +1863,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 23: /* $@6: %empty  */
-#line 286 "src/Slice/Grammar.y"
+#line 284 "src/Slice/Grammar.y"
 {
     assert(yyvsp[0] == nullptr);
 }
@@ -1871,7 +1871,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 25: /* definition: exception_decl  */
-#line 291 "src/Slice/Grammar.y"
+#line 289 "src/Slice/Grammar.y"
 {
     currentUnit->error("`;' missing after exception forward declaration");
 }
@@ -1879,7 +1879,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 26: /* $@7: %empty  */
-#line 295 "src/Slice/Grammar.y"
+#line 293 "src/Slice/Grammar.y"
 {
     assert(yyvsp[0] == nullptr || dynamic_pointer_cast<Exception>(yyvsp[0]));
 }
@@ -1887,7 +1887,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 28: /* $@8: %empty  */
-#line 300 "src/Slice/Grammar.y"
+#line 298 "src/Slice/Grammar.y"
 {
     assert(yyvsp[0] == nullptr);
 }
@@ -1895,7 +1895,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 30: /* definition: struct_decl  */
-#line 305 "src/Slice/Grammar.y"
+#line 303 "src/Slice/Grammar.y"
 {
     currentUnit->error("`;' missing after struct forward declaration");
 }
@@ -1903,7 +1903,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 31: /* $@9: %empty  */
-#line 309 "src/Slice/Grammar.y"
+#line 307 "src/Slice/Grammar.y"
 {
     assert(yyvsp[0] == nullptr || dynamic_pointer_cast<Struct>(yyvsp[0]));
 }
@@ -1911,7 +1911,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 33: /* $@10: %empty  */
-#line 314 "src/Slice/Grammar.y"
+#line 312 "src/Slice/Grammar.y"
 {
     assert(yyvsp[0] == nullptr || dynamic_pointer_cast<Sequence>(yyvsp[0]));
 }
@@ -1919,7 +1919,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 35: /* definition: sequence_def  */
-#line 319 "src/Slice/Grammar.y"
+#line 317 "src/Slice/Grammar.y"
 {
     currentUnit->error("`;' missing after sequence definition");
 }
@@ -1927,7 +1927,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 36: /* $@11: %empty  */
-#line 323 "src/Slice/Grammar.y"
+#line 321 "src/Slice/Grammar.y"
 {
     assert(yyvsp[0] == nullptr || dynamic_pointer_cast<Dictionary>(yyvsp[0]));
 }
@@ -1935,7 +1935,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 38: /* definition: dictionary_def  */
-#line 328 "src/Slice/Grammar.y"
+#line 326 "src/Slice/Grammar.y"
 {
     currentUnit->error("`;' missing after dictionary definition");
 }
@@ -1943,7 +1943,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 39: /* $@12: %empty  */
-#line 332 "src/Slice/Grammar.y"
+#line 330 "src/Slice/Grammar.y"
 {
     assert(yyvsp[0] == nullptr || dynamic_pointer_cast<Enum>(yyvsp[0]));
 }
@@ -1951,7 +1951,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 41: /* $@13: %empty  */
-#line 337 "src/Slice/Grammar.y"
+#line 335 "src/Slice/Grammar.y"
 {
     assert(yyvsp[0] == nullptr || dynamic_pointer_cast<Const>(yyvsp[0]));
 }
@@ -1959,7 +1959,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 43: /* definition: const_def  */
-#line 342 "src/Slice/Grammar.y"
+#line 340 "src/Slice/Grammar.y"
 {
     currentUnit->error("`;' missing after const definition");
 }
@@ -1967,7 +1967,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 44: /* definition: error ';'  */
-#line 346 "src/Slice/Grammar.y"
+#line 344 "src/Slice/Grammar.y"
 {
     yyerrok;
 }
@@ -1975,7 +1975,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 45: /* @14: %empty  */
-#line 355 "src/Slice/Grammar.y"
+#line 353 "src/Slice/Grammar.y"
 {
     currentUnit->setSeenDefinition();
 
@@ -1997,7 +1997,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 46: /* module_def: ICE_MODULE ICE_IDENTIFIER @14 '{' definitions '}'  */
-#line 373 "src/Slice/Grammar.y"
+#line 371 "src/Slice/Grammar.y"
 {
     if (yyvsp[-3])
     {
@@ -2013,7 +2013,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 47: /* @15: %empty  */
-#line 385 "src/Slice/Grammar.y"
+#line 383 "src/Slice/Grammar.y"
 {
     currentUnit->setSeenDefinition();
 
@@ -2072,7 +2072,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 48: /* module_def: ICE_MODULE ICE_SCOPED_IDENTIFIER @15 '{' definitions '}'  */
-#line 440 "src/Slice/Grammar.y"
+#line 438 "src/Slice/Grammar.y"
 {
     if (yyvsp[-3])
     {
@@ -2100,7 +2100,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 49: /* exception_id: ICE_EXCEPTION ICE_IDENTIFIER  */
-#line 469 "src/Slice/Grammar.y"
+#line 467 "src/Slice/Grammar.y"
 {
     yyval = yyvsp[0];
 }
@@ -2108,7 +2108,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 50: /* exception_id: ICE_EXCEPTION keyword  */
-#line 473 "src/Slice/Grammar.y"
+#line 471 "src/Slice/Grammar.y"
 {
     auto ident = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     currentUnit->error("keyword `" + ident->v + "' cannot be used as exception name");
@@ -2118,7 +2118,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 51: /* exception_decl: exception_id  */
-#line 484 "src/Slice/Grammar.y"
+#line 482 "src/Slice/Grammar.y"
 {
     currentUnit->error("exceptions cannot be forward declared");
     yyval = nullptr;
@@ -2127,7 +2127,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 52: /* @16: %empty  */
-#line 494 "src/Slice/Grammar.y"
+#line 492 "src/Slice/Grammar.y"
 {
     auto ident = dynamic_pointer_cast<StringTok>(yyvsp[-1]);
     auto base = dynamic_pointer_cast<Exception>(yyvsp[0]);
@@ -2144,7 +2144,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 53: /* exception_def: exception_id exception_extends @16 '{' data_members '}'  */
-#line 507 "src/Slice/Grammar.y"
+#line 505 "src/Slice/Grammar.y"
 {
     if (yyvsp[-3])
     {
@@ -2156,7 +2156,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 54: /* exception_extends: extends scoped_name  */
-#line 520 "src/Slice/Grammar.y"
+#line 518 "src/Slice/Grammar.y"
 {
     auto scoped = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     ContainerPtr cont = currentUnit->currentContainer();
@@ -2168,7 +2168,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 55: /* exception_extends: %empty  */
-#line 528 "src/Slice/Grammar.y"
+#line 526 "src/Slice/Grammar.y"
 {
     yyval = nullptr;
 }
@@ -2176,7 +2176,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 56: /* type_id: type ICE_IDENTIFIER  */
-#line 537 "src/Slice/Grammar.y"
+#line 535 "src/Slice/Grammar.y"
 {
     auto type = dynamic_pointer_cast<Type>(yyvsp[-1]);
     auto ident = dynamic_pointer_cast<StringTok>(yyvsp[0]);
@@ -2186,7 +2186,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 57: /* optional: ICE_OPTIONAL_OPEN ICE_INTEGER_LITERAL ')'  */
-#line 548 "src/Slice/Grammar.y"
+#line 546 "src/Slice/Grammar.y"
 {
     auto i = dynamic_pointer_cast<IntegerTok>(yyvsp[-1]);
 
@@ -2208,7 +2208,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 58: /* optional: ICE_OPTIONAL_OPEN scoped_name ')'  */
-#line 566 "src/Slice/Grammar.y"
+#line 564 "src/Slice/Grammar.y"
 {
     auto scoped = dynamic_pointer_cast<StringTok>(yyvsp[-1]);
     ContainerPtr cont = currentUnit->currentContainer();
@@ -2287,7 +2287,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 59: /* optional: ICE_OPTIONAL_OPEN ')'  */
-#line 641 "src/Slice/Grammar.y"
+#line 639 "src/Slice/Grammar.y"
 {
     currentUnit->error("missing tag");
     auto m = make_shared<OptionalDefTok>(-1); // Dummy
@@ -2297,7 +2297,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 60: /* optional: ICE_OPTIONAL  */
-#line 647 "src/Slice/Grammar.y"
+#line 645 "src/Slice/Grammar.y"
 {
     currentUnit->error("missing tag");
     auto m = make_shared<OptionalDefTok>(-1); // Dummy
@@ -2307,7 +2307,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 61: /* optional_type_id: optional type_id  */
-#line 658 "src/Slice/Grammar.y"
+#line 656 "src/Slice/Grammar.y"
 {
     auto m = dynamic_pointer_cast<OptionalDefTok>(yyvsp[-1]);
     auto ts = dynamic_pointer_cast<TypeStringTok>(yyvsp[0]);
@@ -2328,7 +2328,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 62: /* optional_type_id: type_id  */
-#line 675 "src/Slice/Grammar.y"
+#line 673 "src/Slice/Grammar.y"
 {
     auto ts = dynamic_pointer_cast<TypeStringTok>(yyvsp[0]);
     auto m = make_shared<OptionalDefTok>(-1);
@@ -2340,7 +2340,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 63: /* struct_id: ICE_STRUCT ICE_IDENTIFIER  */
-#line 688 "src/Slice/Grammar.y"
+#line 686 "src/Slice/Grammar.y"
 {
     yyval = yyvsp[0];
 }
@@ -2348,7 +2348,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 64: /* struct_id: ICE_STRUCT keyword  */
-#line 692 "src/Slice/Grammar.y"
+#line 690 "src/Slice/Grammar.y"
 {
     auto ident = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     currentUnit->error("keyword `" + ident->v + "' cannot be used as struct name");
@@ -2358,7 +2358,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 65: /* struct_decl: struct_id  */
-#line 703 "src/Slice/Grammar.y"
+#line 701 "src/Slice/Grammar.y"
 {
     currentUnit->error("structs cannot be forward declared");
     yyval = nullptr; // Dummy
@@ -2367,7 +2367,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 66: /* @17: %empty  */
-#line 713 "src/Slice/Grammar.y"
+#line 711 "src/Slice/Grammar.y"
 {
     auto ident = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     ContainerPtr cont = currentUnit->currentContainer();
@@ -2389,7 +2389,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 67: /* struct_def: struct_id @17 '{' data_members '}'  */
-#line 731 "src/Slice/Grammar.y"
+#line 729 "src/Slice/Grammar.y"
 {
     if (yyvsp[-3])
     {
@@ -2409,7 +2409,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 68: /* class_name: ICE_CLASS ICE_IDENTIFIER  */
-#line 752 "src/Slice/Grammar.y"
+#line 750 "src/Slice/Grammar.y"
 {
     yyval = yyvsp[0];
 }
@@ -2417,7 +2417,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 69: /* class_name: ICE_CLASS keyword  */
-#line 756 "src/Slice/Grammar.y"
+#line 754 "src/Slice/Grammar.y"
 {
     auto ident = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     currentUnit->error("keyword `" + ident->v + "' cannot be used as class name");
@@ -2427,7 +2427,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 70: /* class_id: ICE_CLASS ICE_IDENT_OPEN ICE_INTEGER_LITERAL ')'  */
-#line 767 "src/Slice/Grammar.y"
+#line 765 "src/Slice/Grammar.y"
 {
     int64_t id = dynamic_pointer_cast<IntegerTok>(yyvsp[-1])->v;
     if (id < 0)
@@ -2456,7 +2456,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 71: /* class_id: ICE_CLASS ICE_IDENT_OPEN scoped_name ')'  */
-#line 792 "src/Slice/Grammar.y"
+#line 790 "src/Slice/Grammar.y"
 {
     auto scoped = dynamic_pointer_cast<StringTok>(yyvsp[-1]);
 
@@ -2547,7 +2547,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 72: /* class_id: class_name  */
-#line 879 "src/Slice/Grammar.y"
+#line 877 "src/Slice/Grammar.y"
 {
     auto classId = make_shared<ClassIdTok>();
     classId->v = dynamic_pointer_cast<StringTok>(yyvsp[0])->v;
@@ -2558,7 +2558,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 73: /* class_decl: class_name  */
-#line 891 "src/Slice/Grammar.y"
+#line 889 "src/Slice/Grammar.y"
 {
     auto ident = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     ContainerPtr cont = currentUnit->currentContainer();
@@ -2569,7 +2569,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 74: /* @18: %empty  */
-#line 903 "src/Slice/Grammar.y"
+#line 901 "src/Slice/Grammar.y"
 {
     auto ident = dynamic_pointer_cast<ClassIdTok>(yyvsp[-1]);
     ContainerPtr cont = currentUnit->currentContainer();
@@ -2590,7 +2590,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 75: /* class_def: class_id class_extends @18 '{' data_members '}'  */
-#line 920 "src/Slice/Grammar.y"
+#line 918 "src/Slice/Grammar.y"
 {
     if (yyvsp[-3])
     {
@@ -2606,7 +2606,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 76: /* class_extends: extends scoped_name  */
-#line 937 "src/Slice/Grammar.y"
+#line 935 "src/Slice/Grammar.y"
 {
     auto scoped = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     ContainerPtr cont = currentUnit->currentContainer();
@@ -2644,7 +2644,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 77: /* class_extends: %empty  */
-#line 971 "src/Slice/Grammar.y"
+#line 969 "src/Slice/Grammar.y"
 {
     yyval = nullptr;
 }
@@ -2652,21 +2652,21 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 78: /* extends: ICE_EXTENDS  */
-#line 980 "src/Slice/Grammar.y"
+#line 978 "src/Slice/Grammar.y"
 {
 }
 #line 2659 "src/Slice/Grammar.cpp"
     break;
 
   case 79: /* extends: ':'  */
-#line 983 "src/Slice/Grammar.y"
+#line 981 "src/Slice/Grammar.y"
 {
 }
 #line 2666 "src/Slice/Grammar.cpp"
     break;
 
   case 80: /* data_members: metadata data_member ';' data_members  */
-#line 991 "src/Slice/Grammar.y"
+#line 989 "src/Slice/Grammar.y"
 {
     auto metadata = dynamic_pointer_cast<MetadataListTok>(yyvsp[-3]);
     auto contained = dynamic_pointer_cast<Contained>(yyvsp[-2]);
@@ -2679,14 +2679,14 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 81: /* data_members: error ';' data_members  */
-#line 1000 "src/Slice/Grammar.y"
+#line 998 "src/Slice/Grammar.y"
 {
 }
 #line 2686 "src/Slice/Grammar.cpp"
     break;
 
   case 82: /* data_members: metadata data_member  */
-#line 1003 "src/Slice/Grammar.y"
+#line 1001 "src/Slice/Grammar.y"
 {
     currentUnit->error("`;' missing after definition");
 }
@@ -2694,14 +2694,14 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 83: /* data_members: %empty  */
-#line 1007 "src/Slice/Grammar.y"
+#line 1005 "src/Slice/Grammar.y"
 {
 }
 #line 2701 "src/Slice/Grammar.cpp"
     break;
 
   case 84: /* data_member: optional_type_id  */
-#line 1015 "src/Slice/Grammar.y"
+#line 1013 "src/Slice/Grammar.y"
 {
     auto def = dynamic_pointer_cast<OptionalDefTok>(yyvsp[0]);
     auto cl = dynamic_pointer_cast<ClassDef>(currentUnit->currentContainer());
@@ -2735,7 +2735,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 85: /* data_member: optional_type_id '=' const_initializer  */
-#line 1045 "src/Slice/Grammar.y"
+#line 1043 "src/Slice/Grammar.y"
 {
     auto def = dynamic_pointer_cast<OptionalDefTok>(yyvsp[-2]);
     auto value = dynamic_pointer_cast<ConstDefTok>(yyvsp[0]);
@@ -2770,7 +2770,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 86: /* data_member: type keyword  */
-#line 1076 "src/Slice/Grammar.y"
+#line 1074 "src/Slice/Grammar.y"
 {
     auto type = dynamic_pointer_cast<Type>(yyvsp[-1]);
     string name = dynamic_pointer_cast<StringTok>(yyvsp[0])->v;
@@ -2796,7 +2796,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 87: /* data_member: type  */
-#line 1098 "src/Slice/Grammar.y"
+#line 1096 "src/Slice/Grammar.y"
 {
     auto type = dynamic_pointer_cast<Type>(yyvsp[0]);
     auto cl = dynamic_pointer_cast<ClassDef>(currentUnit->currentContainer());
@@ -2821,7 +2821,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 88: /* return_type: optional type  */
-#line 1124 "src/Slice/Grammar.y"
+#line 1122 "src/Slice/Grammar.y"
 {
     auto m = dynamic_pointer_cast<OptionalDefTok>(yyvsp[-1]);
     m->type = dynamic_pointer_cast<Type>(yyvsp[0]);
@@ -2840,7 +2840,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 89: /* return_type: type  */
-#line 1139 "src/Slice/Grammar.y"
+#line 1137 "src/Slice/Grammar.y"
 {
     auto m = make_shared<OptionalDefTok>(-1);
     m->type = dynamic_pointer_cast<Type>(yyvsp[0]);
@@ -2850,7 +2850,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 90: /* return_type: ICE_VOID  */
-#line 1145 "src/Slice/Grammar.y"
+#line 1143 "src/Slice/Grammar.y"
 {
     auto m = make_shared<OptionalDefTok>(-1);
     yyval = m;
@@ -2859,7 +2859,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 91: /* operation_preamble: return_type ICE_IDENT_OPEN  */
-#line 1155 "src/Slice/Grammar.y"
+#line 1153 "src/Slice/Grammar.y"
 {
     auto returnType = dynamic_pointer_cast<OptionalDefTok>(yyvsp[-1]);
     string name = dynamic_pointer_cast<StringTok>(yyvsp[0])->v;
@@ -2887,7 +2887,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 92: /* operation_preamble: ICE_IDEMPOTENT return_type ICE_IDENT_OPEN  */
-#line 1179 "src/Slice/Grammar.y"
+#line 1177 "src/Slice/Grammar.y"
 {
     auto returnType = dynamic_pointer_cast<OptionalDefTok>(yyvsp[-1]);
     string name = dynamic_pointer_cast<StringTok>(yyvsp[0])->v;
@@ -2921,7 +2921,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 93: /* operation_preamble: return_type ICE_KEYWORD_OPEN  */
-#line 1209 "src/Slice/Grammar.y"
+#line 1207 "src/Slice/Grammar.y"
 {
     auto returnType = dynamic_pointer_cast<OptionalDefTok>(yyvsp[-1]);
     string name = dynamic_pointer_cast<StringTok>(yyvsp[0])->v;
@@ -2949,7 +2949,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 94: /* operation_preamble: ICE_IDEMPOTENT return_type ICE_KEYWORD_OPEN  */
-#line 1233 "src/Slice/Grammar.y"
+#line 1231 "src/Slice/Grammar.y"
 {
     auto returnType = dynamic_pointer_cast<OptionalDefTok>(yyvsp[-1]);
     string name = dynamic_pointer_cast<StringTok>(yyvsp[0])->v;
@@ -2982,7 +2982,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 95: /* @19: %empty  */
-#line 1267 "src/Slice/Grammar.y"
+#line 1265 "src/Slice/Grammar.y"
 {
     if (yyvsp[-2])
     {
@@ -2998,7 +2998,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 96: /* operation: operation_preamble parameters ')' @19 throws  */
-#line 1279 "src/Slice/Grammar.y"
+#line 1277 "src/Slice/Grammar.y"
 {
     auto op = dynamic_pointer_cast<Operation>(yyvsp[-1]);
     auto el = dynamic_pointer_cast<ExceptionListTok>(yyvsp[0]);
@@ -3012,7 +3012,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 97: /* @20: %empty  */
-#line 1289 "src/Slice/Grammar.y"
+#line 1287 "src/Slice/Grammar.y"
 {
     if (yyvsp[-2])
     {
@@ -3024,7 +3024,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 98: /* operation: operation_preamble error ')' @20 throws  */
-#line 1297 "src/Slice/Grammar.y"
+#line 1295 "src/Slice/Grammar.y"
 {
     auto op = dynamic_pointer_cast<Operation>(yyvsp[-1]);
     auto el = dynamic_pointer_cast<ExceptionListTok>(yyvsp[0]);
@@ -3038,7 +3038,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 99: /* interface_id: ICE_INTERFACE ICE_IDENTIFIER  */
-#line 1312 "src/Slice/Grammar.y"
+#line 1310 "src/Slice/Grammar.y"
 {
     yyval = yyvsp[0];
 }
@@ -3046,7 +3046,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 100: /* interface_id: ICE_INTERFACE keyword  */
-#line 1316 "src/Slice/Grammar.y"
+#line 1314 "src/Slice/Grammar.y"
 {
     auto ident = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     currentUnit->error("keyword `" + ident->v + "' cannot be used as interface name");
@@ -3056,7 +3056,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 101: /* interface_decl: interface_id  */
-#line 1327 "src/Slice/Grammar.y"
+#line 1325 "src/Slice/Grammar.y"
 {
     auto ident = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     auto cont = currentUnit->currentContainer();
@@ -3068,7 +3068,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 102: /* @21: %empty  */
-#line 1340 "src/Slice/Grammar.y"
+#line 1338 "src/Slice/Grammar.y"
 {
     auto ident = dynamic_pointer_cast<StringTok>(yyvsp[-1]);
     ContainerPtr cont = currentUnit->currentContainer();
@@ -3089,7 +3089,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 103: /* interface_def: interface_id interface_extends @21 '{' operations '}'  */
-#line 1357 "src/Slice/Grammar.y"
+#line 1355 "src/Slice/Grammar.y"
 {
     if (yyvsp[-3])
     {
@@ -3105,7 +3105,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 104: /* interface_list: scoped_name ',' interface_list  */
-#line 1374 "src/Slice/Grammar.y"
+#line 1372 "src/Slice/Grammar.y"
 {
     auto intfs = dynamic_pointer_cast<InterfaceListTok>(yyvsp[0]);
     auto scoped = dynamic_pointer_cast<StringTok>(yyvsp[-2]);
@@ -3144,7 +3144,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 105: /* interface_list: scoped_name  */
-#line 1409 "src/Slice/Grammar.y"
+#line 1407 "src/Slice/Grammar.y"
 {
     auto intfs = make_shared<InterfaceListTok>();
     auto scoped = dynamic_pointer_cast<StringTok>(yyvsp[0]);
@@ -3183,7 +3183,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 106: /* interface_list: ICE_OBJECT  */
-#line 1444 "src/Slice/Grammar.y"
+#line 1442 "src/Slice/Grammar.y"
 {
     currentUnit->error("illegal inheritance from type Object");
     yyval = make_shared<InterfaceListTok>(); // Dummy
@@ -3192,7 +3192,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 107: /* interface_list: ICE_VALUE  */
-#line 1449 "src/Slice/Grammar.y"
+#line 1447 "src/Slice/Grammar.y"
 {
     currentUnit->error("illegal inheritance from type Value");
     yyval = make_shared<InterfaceListTok>(); // Dummy
@@ -3201,7 +3201,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 108: /* interface_extends: extends interface_list  */
-#line 1459 "src/Slice/Grammar.y"
+#line 1457 "src/Slice/Grammar.y"
 {
     yyval = yyvsp[0];
 }
@@ -3209,7 +3209,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 109: /* interface_extends: %empty  */
-#line 1463 "src/Slice/Grammar.y"
+#line 1461 "src/Slice/Grammar.y"
 {
     yyval = make_shared<InterfaceListTok>();
 }
@@ -3217,7 +3217,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 110: /* operations: metadata operation ';' operations  */
-#line 1472 "src/Slice/Grammar.y"
+#line 1470 "src/Slice/Grammar.y"
 {
     auto metadata = dynamic_pointer_cast<MetadataListTok>(yyvsp[-3]);
     auto contained = dynamic_pointer_cast<Contained>(yyvsp[-2]);
@@ -3230,14 +3230,14 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 111: /* operations: error ';' operations  */
-#line 1481 "src/Slice/Grammar.y"
+#line 1479 "src/Slice/Grammar.y"
 {
 }
 #line 3237 "src/Slice/Grammar.cpp"
     break;
 
   case 112: /* operations: metadata operation  */
-#line 1484 "src/Slice/Grammar.y"
+#line 1482 "src/Slice/Grammar.y"
 {
     currentUnit->error("`;' missing after definition");
 }
@@ -3245,14 +3245,14 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 113: /* operations: %empty  */
-#line 1488 "src/Slice/Grammar.y"
+#line 1486 "src/Slice/Grammar.y"
 {
 }
 #line 3252 "src/Slice/Grammar.cpp"
     break;
 
   case 114: /* exception_list: exception ',' exception_list  */
-#line 1496 "src/Slice/Grammar.y"
+#line 1494 "src/Slice/Grammar.y"
 {
     auto exception = dynamic_pointer_cast<Exception>(yyvsp[-2]);
     auto exceptionList = dynamic_pointer_cast<ExceptionListTok>(yyvsp[0]);
@@ -3263,7 +3263,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 115: /* exception_list: exception  */
-#line 1503 "src/Slice/Grammar.y"
+#line 1501 "src/Slice/Grammar.y"
 {
     auto exception = dynamic_pointer_cast<Exception>(yyvsp[0]);
     auto exceptionList = make_shared<ExceptionListTok>();
@@ -3274,7 +3274,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 116: /* exception: scoped_name  */
-#line 1515 "src/Slice/Grammar.y"
+#line 1513 "src/Slice/Grammar.y"
 {
     auto scoped = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     ContainerPtr cont = currentUnit->currentContainer();
@@ -3290,7 +3290,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 117: /* exception: keyword  */
-#line 1527 "src/Slice/Grammar.y"
+#line 1525 "src/Slice/Grammar.y"
 {
     auto ident = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     currentUnit->error("keyword `" + ident->v + "' cannot be used as exception name");
@@ -3300,7 +3300,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 118: /* sequence_def: ICE_SEQUENCE '<' metadata type '>' ICE_IDENTIFIER  */
-#line 1538 "src/Slice/Grammar.y"
+#line 1536 "src/Slice/Grammar.y"
 {
     auto ident = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     auto metadata = dynamic_pointer_cast<MetadataListTok>(yyvsp[-3]);
@@ -3312,7 +3312,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 119: /* sequence_def: ICE_SEQUENCE '<' metadata type '>' keyword  */
-#line 1546 "src/Slice/Grammar.y"
+#line 1544 "src/Slice/Grammar.y"
 {
     auto ident = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     auto metadata = dynamic_pointer_cast<MetadataListTok>(yyvsp[-3]);
@@ -3325,7 +3325,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 120: /* dictionary_def: ICE_DICTIONARY '<' metadata type ',' metadata type '>' ICE_IDENTIFIER  */
-#line 1560 "src/Slice/Grammar.y"
+#line 1558 "src/Slice/Grammar.y"
 {
     auto ident = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     auto keyMetadata = dynamic_pointer_cast<MetadataListTok>(yyvsp[-6]);
@@ -3339,7 +3339,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 121: /* dictionary_def: ICE_DICTIONARY '<' metadata type ',' metadata type '>' keyword  */
-#line 1570 "src/Slice/Grammar.y"
+#line 1568 "src/Slice/Grammar.y"
 {
     auto ident = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     auto keyMetadata = dynamic_pointer_cast<MetadataListTok>(yyvsp[-6]);
@@ -3354,7 +3354,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 122: /* enum_id: ICE_ENUM ICE_IDENTIFIER  */
-#line 1586 "src/Slice/Grammar.y"
+#line 1584 "src/Slice/Grammar.y"
 {
     yyval = yyvsp[0];
 }
@@ -3362,7 +3362,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 123: /* enum_id: ICE_ENUM keyword  */
-#line 1590 "src/Slice/Grammar.y"
+#line 1588 "src/Slice/Grammar.y"
 {
     auto ident = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     currentUnit->error("keyword `" + ident->v + "' cannot be used as enumeration name");
@@ -3372,7 +3372,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 124: /* @22: %empty  */
-#line 1601 "src/Slice/Grammar.y"
+#line 1599 "src/Slice/Grammar.y"
 {
     auto ident = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     ContainerPtr cont = currentUnit->currentContainer();
@@ -3392,7 +3392,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 125: /* enum_def: enum_id @22 '{' enumerator_list '}'  */
-#line 1617 "src/Slice/Grammar.y"
+#line 1615 "src/Slice/Grammar.y"
 {
     auto en = dynamic_pointer_cast<Enum>(yyvsp[-3]);
     if (en)
@@ -3410,7 +3410,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 126: /* @23: %empty  */
-#line 1632 "src/Slice/Grammar.y"
+#line 1630 "src/Slice/Grammar.y"
 {
     currentUnit->error("missing enumeration name");
     ContainerPtr cont = currentUnit->currentContainer();
@@ -3422,7 +3422,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 127: /* enum_def: ICE_ENUM @23 '{' enumerator_list '}'  */
-#line 1640 "src/Slice/Grammar.y"
+#line 1638 "src/Slice/Grammar.y"
 {
     currentUnit->popContainer();
     yyval = yyvsp[-4];
@@ -3431,7 +3431,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 128: /* enumerator_list: metadata enumerator ',' enumerator_list  */
-#line 1650 "src/Slice/Grammar.y"
+#line 1648 "src/Slice/Grammar.y"
 {
     auto metadata = dynamic_pointer_cast<MetadataListTok>(yyvsp[-3]);
     auto enumerator = dynamic_pointer_cast<Enumerator>(yyvsp[-2]);
@@ -3447,7 +3447,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 129: /* enumerator_list: metadata enumerator  */
-#line 1662 "src/Slice/Grammar.y"
+#line 1660 "src/Slice/Grammar.y"
 {
     auto metadata = dynamic_pointer_cast<MetadataListTok>(yyvsp[-1]);
     auto enumerator = dynamic_pointer_cast<Enumerator>(yyvsp[0]);
@@ -3463,7 +3463,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 130: /* enumerator_list: %empty  */
-#line 1674 "src/Slice/Grammar.y"
+#line 1672 "src/Slice/Grammar.y"
 {
     yyval = make_shared<EnumeratorListTok>(); // Empty list
 }
@@ -3471,7 +3471,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 131: /* enumerator: ICE_IDENTIFIER  */
-#line 1683 "src/Slice/Grammar.y"
+#line 1681 "src/Slice/Grammar.y"
 {
     auto ident = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     EnumPtr cont = dynamic_pointer_cast<Enum>(currentUnit->currentContainer());
@@ -3481,7 +3481,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 132: /* enumerator: ICE_IDENTIFIER '=' enumerator_initializer  */
-#line 1689 "src/Slice/Grammar.y"
+#line 1687 "src/Slice/Grammar.y"
 {
     auto ident = dynamic_pointer_cast<StringTok>(yyvsp[-2]);
     EnumPtr cont = dynamic_pointer_cast<Enum>(currentUnit->currentContainer());
@@ -3503,7 +3503,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 133: /* enumerator: keyword  */
-#line 1707 "src/Slice/Grammar.y"
+#line 1705 "src/Slice/Grammar.y"
 {
     auto ident = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     EnumPtr cont = dynamic_pointer_cast<Enum>(currentUnit->currentContainer());
@@ -3514,7 +3514,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 134: /* enumerator_initializer: ICE_INTEGER_LITERAL  */
-#line 1719 "src/Slice/Grammar.y"
+#line 1717 "src/Slice/Grammar.y"
 {
     yyval = yyvsp[0];
 }
@@ -3522,7 +3522,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 135: /* enumerator_initializer: scoped_name  */
-#line 1723 "src/Slice/Grammar.y"
+#line 1721 "src/Slice/Grammar.y"
 {
     auto scoped = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     ContainedList cl = currentUnit->currentContainer()->lookupContained(scoped->v, true);
@@ -3562,7 +3562,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 136: /* out_qualifier: ICE_OUT  */
-#line 1764 "src/Slice/Grammar.y"
+#line 1762 "src/Slice/Grammar.y"
 {
     auto out = make_shared<BoolTok>();
     out->v = true;
@@ -3572,7 +3572,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 137: /* out_qualifier: %empty  */
-#line 1770 "src/Slice/Grammar.y"
+#line 1768 "src/Slice/Grammar.y"
 {
     auto out = make_shared<BoolTok>();
     out->v = false;
@@ -3582,14 +3582,14 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 138: /* parameters: %empty  */
-#line 1781 "src/Slice/Grammar.y"
+#line 1779 "src/Slice/Grammar.y"
 {
 }
 #line 3589 "src/Slice/Grammar.cpp"
     break;
 
   case 139: /* parameters: out_qualifier metadata optional_type_id  */
-#line 1784 "src/Slice/Grammar.y"
+#line 1782 "src/Slice/Grammar.y"
 {
     auto isOutParam = dynamic_pointer_cast<BoolTok>(yyvsp[-2]);
     auto tsp = dynamic_pointer_cast<OptionalDefTok>(yyvsp[0]);
@@ -3609,7 +3609,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 140: /* parameters: parameters ',' out_qualifier metadata optional_type_id  */
-#line 1800 "src/Slice/Grammar.y"
+#line 1798 "src/Slice/Grammar.y"
 {
     auto isOutParam = dynamic_pointer_cast<BoolTok>(yyvsp[-2]);
     auto tsp = dynamic_pointer_cast<OptionalDefTok>(yyvsp[0]);
@@ -3629,7 +3629,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 141: /* parameters: out_qualifier metadata type keyword  */
-#line 1816 "src/Slice/Grammar.y"
+#line 1814 "src/Slice/Grammar.y"
 {
     auto isOutParam = dynamic_pointer_cast<BoolTok>(yyvsp[-3]);
     auto type = dynamic_pointer_cast<Type>(yyvsp[-1]);
@@ -3645,7 +3645,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 142: /* parameters: parameters ',' out_qualifier metadata type keyword  */
-#line 1828 "src/Slice/Grammar.y"
+#line 1826 "src/Slice/Grammar.y"
 {
     auto isOutParam = dynamic_pointer_cast<BoolTok>(yyvsp[-3]);
     auto type = dynamic_pointer_cast<Type>(yyvsp[-1]);
@@ -3661,7 +3661,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 143: /* parameters: out_qualifier metadata type  */
-#line 1840 "src/Slice/Grammar.y"
+#line 1838 "src/Slice/Grammar.y"
 {
     auto isOutParam = dynamic_pointer_cast<BoolTok>(yyvsp[-2]);
     auto type = dynamic_pointer_cast<Type>(yyvsp[0]);
@@ -3676,7 +3676,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 144: /* parameters: parameters ',' out_qualifier metadata type  */
-#line 1851 "src/Slice/Grammar.y"
+#line 1849 "src/Slice/Grammar.y"
 {
     auto isOutParam = dynamic_pointer_cast<BoolTok>(yyvsp[-2]);
     auto type = dynamic_pointer_cast<Type>(yyvsp[0]);
@@ -3691,7 +3691,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 145: /* throws: ICE_THROWS exception_list  */
-#line 1867 "src/Slice/Grammar.y"
+#line 1865 "src/Slice/Grammar.y"
 {
     yyval = yyvsp[0];
 }
@@ -3699,7 +3699,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 146: /* throws: %empty  */
-#line 1871 "src/Slice/Grammar.y"
+#line 1869 "src/Slice/Grammar.y"
 {
     yyval = make_shared<ExceptionListTok>();
 }
@@ -3707,81 +3707,81 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 147: /* scoped_name: ICE_IDENTIFIER  */
-#line 1880 "src/Slice/Grammar.y"
+#line 1878 "src/Slice/Grammar.y"
 {
 }
 #line 3714 "src/Slice/Grammar.cpp"
     break;
 
   case 148: /* scoped_name: ICE_SCOPED_IDENTIFIER  */
-#line 1883 "src/Slice/Grammar.y"
+#line 1881 "src/Slice/Grammar.y"
 {
 }
 #line 3721 "src/Slice/Grammar.cpp"
     break;
 
   case 149: /* builtin: ICE_BOOL  */
-#line 1890 "src/Slice/Grammar.y"
+#line 1888 "src/Slice/Grammar.y"
            {}
 #line 3727 "src/Slice/Grammar.cpp"
     break;
 
   case 150: /* builtin: ICE_BYTE  */
-#line 1891 "src/Slice/Grammar.y"
+#line 1889 "src/Slice/Grammar.y"
            {}
 #line 3733 "src/Slice/Grammar.cpp"
     break;
 
   case 151: /* builtin: ICE_SHORT  */
-#line 1892 "src/Slice/Grammar.y"
+#line 1890 "src/Slice/Grammar.y"
             {}
 #line 3739 "src/Slice/Grammar.cpp"
     break;
 
   case 152: /* builtin: ICE_INT  */
-#line 1893 "src/Slice/Grammar.y"
+#line 1891 "src/Slice/Grammar.y"
           {}
 #line 3745 "src/Slice/Grammar.cpp"
     break;
 
   case 153: /* builtin: ICE_LONG  */
-#line 1894 "src/Slice/Grammar.y"
+#line 1892 "src/Slice/Grammar.y"
            {}
 #line 3751 "src/Slice/Grammar.cpp"
     break;
 
   case 154: /* builtin: ICE_FLOAT  */
-#line 1895 "src/Slice/Grammar.y"
+#line 1893 "src/Slice/Grammar.y"
             {}
 #line 3757 "src/Slice/Grammar.cpp"
     break;
 
   case 155: /* builtin: ICE_DOUBLE  */
-#line 1896 "src/Slice/Grammar.y"
+#line 1894 "src/Slice/Grammar.y"
              {}
 #line 3763 "src/Slice/Grammar.cpp"
     break;
 
   case 156: /* builtin: ICE_STRING  */
-#line 1897 "src/Slice/Grammar.y"
+#line 1895 "src/Slice/Grammar.y"
              {}
 #line 3769 "src/Slice/Grammar.cpp"
     break;
 
   case 157: /* builtin: ICE_OBJECT  */
-#line 1898 "src/Slice/Grammar.y"
+#line 1896 "src/Slice/Grammar.y"
              {}
 #line 3775 "src/Slice/Grammar.cpp"
     break;
 
   case 158: /* builtin: ICE_VALUE  */
-#line 1899 "src/Slice/Grammar.y"
+#line 1897 "src/Slice/Grammar.y"
             {}
 #line 3781 "src/Slice/Grammar.cpp"
     break;
 
   case 159: /* type: ICE_OBJECT '*'  */
-#line 1905 "src/Slice/Grammar.y"
+#line 1903 "src/Slice/Grammar.y"
 {
     yyval = currentUnit->createBuiltin(Builtin::KindObjectProxy);
 }
@@ -3789,7 +3789,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 160: /* type: builtin  */
-#line 1909 "src/Slice/Grammar.y"
+#line 1907 "src/Slice/Grammar.y"
 {
     auto typeName = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     yyval = currentUnit->createBuiltin(Builtin::kindFromString(typeName->v).value());
@@ -3798,7 +3798,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 161: /* type: scoped_name  */
-#line 1914 "src/Slice/Grammar.y"
+#line 1912 "src/Slice/Grammar.y"
 {
     auto scoped = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     ContainerPtr cont = currentUnit->currentContainer();
@@ -3827,7 +3827,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 162: /* type: scoped_name '*'  */
-#line 1939 "src/Slice/Grammar.y"
+#line 1937 "src/Slice/Grammar.y"
 {
     auto scoped = dynamic_pointer_cast<StringTok>(yyvsp[-1]);
     ContainerPtr cont = currentUnit->currentContainer();
@@ -3856,7 +3856,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 163: /* string_literal: ICE_STRING_LITERAL string_literal  */
-#line 1969 "src/Slice/Grammar.y"
+#line 1967 "src/Slice/Grammar.y"
 {
     auto str1 = dynamic_pointer_cast<StringTok>(yyvsp[-1]);
     auto str2 = dynamic_pointer_cast<StringTok>(yyvsp[0]);
@@ -3866,14 +3866,14 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 164: /* string_literal: ICE_STRING_LITERAL  */
-#line 1975 "src/Slice/Grammar.y"
+#line 1973 "src/Slice/Grammar.y"
 {
 }
 #line 3873 "src/Slice/Grammar.cpp"
     break;
 
   case 165: /* metadata_list: metadata_list ',' string_literal  */
-#line 1983 "src/Slice/Grammar.y"
+#line 1981 "src/Slice/Grammar.y"
 {
     auto str = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     auto metadataList = dynamic_pointer_cast<MetadataListTok>(yyvsp[-2]);
@@ -3887,7 +3887,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 166: /* metadata_list: string_literal  */
-#line 1993 "src/Slice/Grammar.y"
+#line 1991 "src/Slice/Grammar.y"
 {
     auto str = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     auto metadataList = make_shared<MetadataListTok>();
@@ -3901,7 +3901,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 167: /* const_initializer: ICE_INTEGER_LITERAL  */
-#line 2008 "src/Slice/Grammar.y"
+#line 2006 "src/Slice/Grammar.y"
 {
     BuiltinPtr type = currentUnit->createBuiltin(Builtin::KindLong);
     auto intVal = dynamic_pointer_cast<IntegerTok>(yyvsp[0]);
@@ -3914,7 +3914,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 168: /* const_initializer: ICE_FLOATING_POINT_LITERAL  */
-#line 2017 "src/Slice/Grammar.y"
+#line 2015 "src/Slice/Grammar.y"
 {
     BuiltinPtr type = currentUnit->createBuiltin(Builtin::KindDouble);
     auto floatVal = dynamic_pointer_cast<FloatingTok>(yyvsp[0]);
@@ -3927,7 +3927,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 169: /* const_initializer: scoped_name  */
-#line 2026 "src/Slice/Grammar.y"
+#line 2024 "src/Slice/Grammar.y"
 {
     auto scoped = dynamic_pointer_cast<StringTok>(yyvsp[0]);
     ConstDefTokPtr def;
@@ -3966,7 +3966,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 170: /* const_initializer: ICE_STRING_LITERAL  */
-#line 2061 "src/Slice/Grammar.y"
+#line 2059 "src/Slice/Grammar.y"
 {
     BuiltinPtr type = currentUnit->createBuiltin(Builtin::KindString);
     auto literal = dynamic_pointer_cast<StringTok>(yyvsp[0]);
@@ -3977,7 +3977,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 171: /* const_initializer: ICE_FALSE  */
-#line 2068 "src/Slice/Grammar.y"
+#line 2066 "src/Slice/Grammar.y"
 {
     BuiltinPtr type = currentUnit->createBuiltin(Builtin::KindBool);
     auto literal = dynamic_pointer_cast<StringTok>(yyvsp[0]);
@@ -3988,7 +3988,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 172: /* const_initializer: ICE_TRUE  */
-#line 2075 "src/Slice/Grammar.y"
+#line 2073 "src/Slice/Grammar.y"
 {
     BuiltinPtr type = currentUnit->createBuiltin(Builtin::KindBool);
     auto literal = dynamic_pointer_cast<StringTok>(yyvsp[0]);
@@ -3999,7 +3999,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 173: /* const_def: ICE_CONST metadata type ICE_IDENTIFIER '=' const_initializer  */
-#line 2087 "src/Slice/Grammar.y"
+#line 2085 "src/Slice/Grammar.y"
 {
     auto metadata = dynamic_pointer_cast<MetadataListTok>(yyvsp[-4]);
     auto const_type = dynamic_pointer_cast<Type>(yyvsp[-3]);
@@ -4012,7 +4012,7 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 174: /* const_def: ICE_CONST metadata type '=' const_initializer  */
-#line 2096 "src/Slice/Grammar.y"
+#line 2094 "src/Slice/Grammar.y"
 {
     auto metadata = dynamic_pointer_cast<MetadataListTok>(yyvsp[-3]);
     auto const_type = dynamic_pointer_cast<Type>(yyvsp[-2]);
@@ -4025,163 +4025,163 @@ YYLTYPE yylloc = yyloc_default;
     break;
 
   case 175: /* keyword: ICE_MODULE  */
-#line 2109 "src/Slice/Grammar.y"
+#line 2107 "src/Slice/Grammar.y"
              {}
 #line 4031 "src/Slice/Grammar.cpp"
     break;
 
   case 176: /* keyword: ICE_CLASS  */
-#line 2110 "src/Slice/Grammar.y"
+#line 2108 "src/Slice/Grammar.y"
             {}
 #line 4037 "src/Slice/Grammar.cpp"
     break;
 
   case 177: /* keyword: ICE_INTERFACE  */
-#line 2111 "src/Slice/Grammar.y"
+#line 2109 "src/Slice/Grammar.y"
                 {}
 #line 4043 "src/Slice/Grammar.cpp"
     break;
 
   case 178: /* keyword: ICE_EXCEPTION  */
-#line 2112 "src/Slice/Grammar.y"
+#line 2110 "src/Slice/Grammar.y"
                 {}
 #line 4049 "src/Slice/Grammar.cpp"
     break;
 
   case 179: /* keyword: ICE_STRUCT  */
-#line 2113 "src/Slice/Grammar.y"
+#line 2111 "src/Slice/Grammar.y"
              {}
 #line 4055 "src/Slice/Grammar.cpp"
     break;
 
   case 180: /* keyword: ICE_SEQUENCE  */
-#line 2114 "src/Slice/Grammar.y"
+#line 2112 "src/Slice/Grammar.y"
                {}
 #line 4061 "src/Slice/Grammar.cpp"
     break;
 
   case 181: /* keyword: ICE_DICTIONARY  */
-#line 2115 "src/Slice/Grammar.y"
+#line 2113 "src/Slice/Grammar.y"
                  {}
 #line 4067 "src/Slice/Grammar.cpp"
     break;
 
   case 182: /* keyword: ICE_ENUM  */
-#line 2116 "src/Slice/Grammar.y"
+#line 2114 "src/Slice/Grammar.y"
            {}
 #line 4073 "src/Slice/Grammar.cpp"
     break;
 
   case 183: /* keyword: ICE_OUT  */
-#line 2117 "src/Slice/Grammar.y"
+#line 2115 "src/Slice/Grammar.y"
           {}
 #line 4079 "src/Slice/Grammar.cpp"
     break;
 
   case 184: /* keyword: ICE_EXTENDS  */
-#line 2118 "src/Slice/Grammar.y"
+#line 2116 "src/Slice/Grammar.y"
               {}
 #line 4085 "src/Slice/Grammar.cpp"
     break;
 
   case 185: /* keyword: ICE_THROWS  */
-#line 2119 "src/Slice/Grammar.y"
+#line 2117 "src/Slice/Grammar.y"
              {}
 #line 4091 "src/Slice/Grammar.cpp"
     break;
 
   case 186: /* keyword: ICE_VOID  */
-#line 2120 "src/Slice/Grammar.y"
+#line 2118 "src/Slice/Grammar.y"
            {}
 #line 4097 "src/Slice/Grammar.cpp"
     break;
 
   case 187: /* keyword: ICE_BOOL  */
-#line 2121 "src/Slice/Grammar.y"
+#line 2119 "src/Slice/Grammar.y"
            {}
 #line 4103 "src/Slice/Grammar.cpp"
     break;
 
   case 188: /* keyword: ICE_BYTE  */
-#line 2122 "src/Slice/Grammar.y"
+#line 2120 "src/Slice/Grammar.y"
            {}
 #line 4109 "src/Slice/Grammar.cpp"
     break;
 
   case 189: /* keyword: ICE_SHORT  */
-#line 2123 "src/Slice/Grammar.y"
+#line 2121 "src/Slice/Grammar.y"
             {}
 #line 4115 "src/Slice/Grammar.cpp"
     break;
 
   case 190: /* keyword: ICE_INT  */
-#line 2124 "src/Slice/Grammar.y"
+#line 2122 "src/Slice/Grammar.y"
           {}
 #line 4121 "src/Slice/Grammar.cpp"
     break;
 
   case 191: /* keyword: ICE_LONG  */
-#line 2125 "src/Slice/Grammar.y"
+#line 2123 "src/Slice/Grammar.y"
            {}
 #line 4127 "src/Slice/Grammar.cpp"
     break;
 
   case 192: /* keyword: ICE_FLOAT  */
-#line 2126 "src/Slice/Grammar.y"
+#line 2124 "src/Slice/Grammar.y"
             {}
 #line 4133 "src/Slice/Grammar.cpp"
     break;
 
   case 193: /* keyword: ICE_DOUBLE  */
-#line 2127 "src/Slice/Grammar.y"
+#line 2125 "src/Slice/Grammar.y"
              {}
 #line 4139 "src/Slice/Grammar.cpp"
     break;
 
   case 194: /* keyword: ICE_STRING  */
-#line 2128 "src/Slice/Grammar.y"
+#line 2126 "src/Slice/Grammar.y"
              {}
 #line 4145 "src/Slice/Grammar.cpp"
     break;
 
   case 195: /* keyword: ICE_OBJECT  */
-#line 2129 "src/Slice/Grammar.y"
+#line 2127 "src/Slice/Grammar.y"
              {}
 #line 4151 "src/Slice/Grammar.cpp"
     break;
 
   case 196: /* keyword: ICE_CONST  */
-#line 2130 "src/Slice/Grammar.y"
+#line 2128 "src/Slice/Grammar.y"
             {}
 #line 4157 "src/Slice/Grammar.cpp"
     break;
 
   case 197: /* keyword: ICE_FALSE  */
-#line 2131 "src/Slice/Grammar.y"
+#line 2129 "src/Slice/Grammar.y"
             {}
 #line 4163 "src/Slice/Grammar.cpp"
     break;
 
   case 198: /* keyword: ICE_TRUE  */
-#line 2132 "src/Slice/Grammar.y"
+#line 2130 "src/Slice/Grammar.y"
            {}
 #line 4169 "src/Slice/Grammar.cpp"
     break;
 
   case 199: /* keyword: ICE_IDEMPOTENT  */
-#line 2133 "src/Slice/Grammar.y"
+#line 2131 "src/Slice/Grammar.y"
                  {}
 #line 4175 "src/Slice/Grammar.cpp"
     break;
 
   case 200: /* keyword: ICE_OPTIONAL  */
-#line 2134 "src/Slice/Grammar.y"
+#line 2132 "src/Slice/Grammar.y"
                {}
 #line 4181 "src/Slice/Grammar.cpp"
     break;
 
   case 201: /* keyword: ICE_VALUE  */
-#line 2135 "src/Slice/Grammar.y"
+#line 2133 "src/Slice/Grammar.y"
             {}
 #line 4187 "src/Slice/Grammar.cpp"
     break;
@@ -4385,5 +4385,7 @@ YYLTYPE yylloc = yyloc_default;
   return yyresult;
 }
 
-#line 2138 "src/Slice/Grammar.y"
+#line 2136 "src/Slice/Grammar.y"
+
 
+// NOLINTEND
diff --git a/cpp/src/Slice/Grammar.h b/cpp/src/Slice/Grammar.h
index 33461400a64..c28168a45e7 100644
--- a/cpp/src/Slice/Grammar.h
+++ b/cpp/src/Slice/Grammar.h
@@ -48,8 +48,6 @@ extern int slice_debug;
 #line 9 "src/Slice/Grammar.y"
 
 
-// NOLINTBEGIN
-
 // Included first to get 'TokenContext' which we need to define YYLTYPE before flex does.
 #include "GrammarUtil.h"
 
@@ -65,7 +63,7 @@ extern int slice_debug;
 #define yyoverflow(a, b, c, d, e, f, g, h) yyerror(a)
 
 
-#line 69 "src/Slice/Grammar.h"
+#line 67 "src/Slice/Grammar.h"
 
 /* Token kinds.  */
 #ifndef YYTOKENTYPE
diff --git a/cpp/src/Slice/Grammar.y b/cpp/src/Slice/Grammar.y
index 16c298e6032..e3371eee3d7 100644
--- a/cpp/src/Slice/Grammar.y
+++ b/cpp/src/Slice/Grammar.y
@@ -8,8 +8,6 @@
 
 %code requires{
 
-// NOLINTBEGIN
-
 // Included first to get 'TokenContext' which we need to define YYLTYPE before flex does.
 #include "GrammarUtil.h"
 
@@ -2136,3 +2134,5 @@ keyword
 ;
 
 %%
+
+// NOLINTEND