diff --git a/arangod/Ahuacatl/ahuacatl-grammar.c b/arangod/Ahuacatl/ahuacatl-grammar.c
index be65d9656b..330a2c523b 100644
--- a/arangod/Ahuacatl/ahuacatl-grammar.c
+++ b/arangod/Ahuacatl/ahuacatl-grammar.c
@@ -551,19 +551,19 @@ static const yytype_uint8 yytranslate[] =
   /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   192,   192,   195,   198,   201,   204,   210,   212,   217,
-     219,   221,   223,   225,   227,   232,   251,   264,   269,   271,
-     276,   290,   290,   315,   317,   322,   335,   338,   344,   344,
-     367,   372,   380,   391,   394,   397,   403,   414,   427,   444,
-     463,   482,   498,   517,   533,   552,   555,   555,   596,   599,
-     602,   605,   608,   611,   614,   645,   652,   666,   666,   695,
-     703,   711,   722,   730,   738,   746,   754,   762,   770,   778,
-     786,   794,   802,   810,   818,   826,   837,   849,   851,   856,
-     861,   869,   872,   878,   878,   891,   893,   898,   903,   911,
-     914,   929,   929,   942,   944,   949,   951,   956,   964,   968,
-     968,  1026,  1043,  1050,  1058,  1066,  1077,  1087,  1097,  1107,
-    1115,  1123,  1134,  1137,  1143,  1146,  1171,  1180,  1183,  1192,
-    1201,  1213,  1227,  1241,  1264,  1276,  1283,  1292,  1298
+       0,   193,   193,   196,   199,   202,   205,   211,   213,   218,
+     220,   222,   224,   226,   228,   233,   252,   265,   270,   272,
+     277,   291,   291,   316,   318,   323,   336,   339,   345,   345,
+     368,   373,   381,   392,   395,   398,   404,   415,   428,   445,
+     464,   483,   499,   518,   534,   553,   556,   556,   597,   600,
+     603,   606,   609,   612,   615,   646,   653,   667,   667,   696,
+     704,   712,   723,   731,   739,   747,   755,   763,   771,   779,
+     787,   795,   803,   811,   819,   827,   838,   850,   852,   857,
+     862,   870,   873,   879,   879,   892,   894,   899,   904,   912,
+     915,   930,   930,   943,   945,   950,   952,   957,   965,   969,
+     969,  1027,  1044,  1051,  1059,  1067,  1078,  1088,  1098,  1108,
+    1116,  1124,  1135,  1138,  1144,  1147,  1172,  1181,  1184,  1193,
+    1202,  1214,  1228,  1242,  1265,  1277,  1284,  1293,  1299
 };
 #endif
 
@@ -1683,7 +1683,7 @@ yyreduce:
   switch (yyn)
     {
         case 2:
-#line 192 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 193 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       context->_type = TRI_AQL_QUERY_READ;
     }
@@ -1691,7 +1691,7 @@ yyreduce:
     break;
 
   case 3:
-#line 195 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 196 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       context->_type = TRI_AQL_QUERY_REMOVE;
     }
@@ -1699,7 +1699,7 @@ yyreduce:
     break;
 
   case 4:
-#line 198 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 199 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       context->_type = TRI_AQL_QUERY_INSERT;
     }
@@ -1707,7 +1707,7 @@ yyreduce:
     break;
 
   case 5:
-#line 201 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 202 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       context->_type = TRI_AQL_QUERY_UPDATE;
     }
@@ -1715,7 +1715,7 @@ yyreduce:
     break;
 
   case 6:
-#line 204 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 205 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       context->_type = TRI_AQL_QUERY_REPLACE;
     }
@@ -1723,63 +1723,63 @@ yyreduce:
     break;
 
   case 7:
-#line 210 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 211 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 1730 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 8:
-#line 212 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 213 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 1737 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 9:
-#line 217 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 218 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 1744 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 10:
-#line 219 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 220 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 1751 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 11:
-#line 221 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 222 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 1758 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 12:
-#line 223 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 224 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 1765 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 13:
-#line 225 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 226 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 1772 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 14:
-#line 227 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 228 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 1779 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 15:
-#line 232 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 233 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node;
       
@@ -1800,7 +1800,7 @@ yyreduce:
     break;
 
   case 16:
-#line 251 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 252 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeFilterAql(context, (yyvsp[0].node));
       if (node == NULL) {
@@ -1815,28 +1815,28 @@ yyreduce:
     break;
 
   case 17:
-#line 264 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 265 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 1822 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 18:
-#line 269 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 270 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 1829 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 19:
-#line 271 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 272 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 1836 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 20:
-#line 276 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 277 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeLetAql(context, (yyvsp[-2].strval), (yyvsp[0].node));
 
@@ -1852,7 +1852,7 @@ yyreduce:
     break;
 
   case 21:
-#line 290 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 291 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeListAql(context);
       
@@ -1866,7 +1866,7 @@ yyreduce:
     break;
 
   case 22:
-#line 298 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 299 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeCollectAql(
                 context, 
@@ -1885,21 +1885,21 @@ yyreduce:
     break;
 
   case 23:
-#line 315 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 316 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 1892 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 24:
-#line 317 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 318 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 1899 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 25:
-#line 322 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 323 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeAssignAql(context, (yyvsp[-2].strval), (yyvsp[0].node));
       if (node == NULL) {
@@ -1914,7 +1914,7 @@ yyreduce:
     break;
 
   case 26:
-#line 335 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 336 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.strval) = NULL;
     }
@@ -1922,7 +1922,7 @@ yyreduce:
     break;
 
   case 27:
-#line 338 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 339 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.strval) = (yyvsp[0].strval);
     }
@@ -1930,7 +1930,7 @@ yyreduce:
     break;
 
   case 28:
-#line 344 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 345 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeListAql(context);
       
@@ -1944,7 +1944,7 @@ yyreduce:
     break;
 
   case 29:
-#line 352 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 353 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* list 
           = static_cast<TRI_aql_node_t*>(TRI_PopStackParseAql(context));
@@ -1961,7 +1961,7 @@ yyreduce:
     break;
 
   case 30:
-#line 367 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 368 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       if (! TRI_PushListAql(context, (yyvsp[0].node))) {
         ABORT_OOM
@@ -1971,7 +1971,7 @@ yyreduce:
     break;
 
   case 31:
-#line 372 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 373 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       if (! TRI_PushListAql(context, (yyvsp[0].node))) {
         ABORT_OOM
@@ -1981,7 +1981,7 @@ yyreduce:
     break;
 
   case 32:
-#line 380 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 381 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeSortElementAql(context, (yyvsp[-1].node), (yyvsp[0].boolval));
       if (node == NULL) {
@@ -1994,7 +1994,7 @@ yyreduce:
     break;
 
   case 33:
-#line 391 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 392 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.boolval) = true;
     }
@@ -2002,7 +2002,7 @@ yyreduce:
     break;
 
   case 34:
-#line 394 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 395 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.boolval) = true;
     }
@@ -2010,7 +2010,7 @@ yyreduce:
     break;
 
   case 35:
-#line 397 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 398 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.boolval) = false;
     }
@@ -2018,7 +2018,7 @@ yyreduce:
     break;
 
   case 36:
-#line 403 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 404 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeLimitAql(context, TRI_CreateNodeValueIntAql(context, 0), (yyvsp[0].node));
       if (node == NULL) {
@@ -2034,7 +2034,7 @@ yyreduce:
     break;
 
   case 37:
-#line 414 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 415 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeLimitAql(context, (yyvsp[-2].node), (yyvsp[0].node));
       if (node == NULL) {
@@ -2049,7 +2049,7 @@ yyreduce:
     break;
 
   case 38:
-#line 427 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 428 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeReturnAql(context, (yyvsp[0].node));
       if (node == NULL) {
@@ -2068,7 +2068,7 @@ yyreduce:
     break;
 
   case 39:
-#line 444 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 445 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node;
 
@@ -2089,7 +2089,7 @@ yyreduce:
     break;
 
   case 40:
-#line 463 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 464 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node;
 
@@ -2110,7 +2110,7 @@ yyreduce:
     break;
 
   case 41:
-#line 482 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 483 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node;
 
@@ -2131,7 +2131,7 @@ yyreduce:
     break;
 
   case 42:
-#line 498 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 499 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node;
 
@@ -2152,7 +2152,7 @@ yyreduce:
     break;
 
   case 43:
-#line 517 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 518 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node;
 
@@ -2173,7 +2173,7 @@ yyreduce:
     break;
 
   case 44:
-#line 533 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 534 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node;
 
@@ -2194,7 +2194,7 @@ yyreduce:
     break;
 
   case 45:
-#line 552 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 553 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.node) = (yyvsp[-1].node);
     }
@@ -2202,7 +2202,7 @@ yyreduce:
     break;
 
   case 46:
-#line 555 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 556 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       if (! TRI_StartScopeAql(context, TRI_AQL_SCOPE_SUBQUERY)) {
         ABORT_OOM
@@ -2215,7 +2215,7 @@ yyreduce:
     break;
 
   case 47:
-#line 562 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 563 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* result;
       TRI_aql_node_t* subQuery;
@@ -2254,7 +2254,7 @@ yyreduce:
     break;
 
   case 48:
-#line 596 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 597 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.node) = (yyvsp[0].node);
     }
@@ -2262,7 +2262,7 @@ yyreduce:
     break;
 
   case 49:
-#line 599 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 600 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.node) = (yyvsp[0].node);
     }
@@ -2270,7 +2270,7 @@ yyreduce:
     break;
 
   case 50:
-#line 602 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 603 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.node) = (yyvsp[0].node);
     }
@@ -2278,7 +2278,7 @@ yyreduce:
     break;
 
   case 51:
-#line 605 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 606 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.node) = (yyvsp[0].node);
     }
@@ -2286,7 +2286,7 @@ yyreduce:
     break;
 
   case 52:
-#line 608 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 609 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.node) = (yyvsp[0].node);
     }
@@ -2294,7 +2294,7 @@ yyreduce:
     break;
 
   case 53:
-#line 611 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 612 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.node) = (yyvsp[0].node);
     }
@@ -2302,7 +2302,7 @@ yyreduce:
     break;
 
   case 54:
-#line 614 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 615 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node;
       TRI_aql_node_t* list;
@@ -2335,7 +2335,7 @@ yyreduce:
     break;
 
   case 55:
-#line 645 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 646 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.strval) = (yyvsp[0].strval);
 
@@ -2347,7 +2347,7 @@ yyreduce:
     break;
 
   case 56:
-#line 652 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 653 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       if ((yyvsp[-2].strval) == NULL || (yyvsp[0].strval) == NULL) {
         ABORT_OOM
@@ -2363,7 +2363,7 @@ yyreduce:
     break;
 
   case 57:
-#line 666 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 667 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node;
 
@@ -2382,7 +2382,7 @@ yyreduce:
     break;
 
   case 58:
-#line 679 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 680 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* list 
         = static_cast<TRI_aql_node_t*>(TRI_PopStackParseAql(context));
@@ -2400,7 +2400,7 @@ yyreduce:
     break;
 
   case 59:
-#line 695 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 696 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeOperatorUnaryPlusAql(context, (yyvsp[0].node));
       if (node == NULL) {
@@ -2413,7 +2413,7 @@ yyreduce:
     break;
 
   case 60:
-#line 703 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 704 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeOperatorUnaryMinusAql(context, (yyvsp[0].node));
       if (node == NULL) {
@@ -2426,7 +2426,7 @@ yyreduce:
     break;
 
   case 61:
-#line 711 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 712 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     { 
       TRI_aql_node_t* node = TRI_CreateNodeOperatorUnaryNotAql(context, (yyvsp[0].node));
       if (node == NULL) {
@@ -2439,7 +2439,7 @@ yyreduce:
     break;
 
   case 62:
-#line 722 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 723 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryOrAql(context, (yyvsp[-2].node), (yyvsp[0].node));
       if (node == NULL) {
@@ -2452,7 +2452,7 @@ yyreduce:
     break;
 
   case 63:
-#line 730 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 731 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryAndAql(context, (yyvsp[-2].node), (yyvsp[0].node));
       if (node == NULL) {
@@ -2465,7 +2465,7 @@ yyreduce:
     break;
 
   case 64:
-#line 738 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 739 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryPlusAql(context, (yyvsp[-2].node), (yyvsp[0].node));
       if (node == NULL) {
@@ -2478,7 +2478,7 @@ yyreduce:
     break;
 
   case 65:
-#line 746 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 747 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryMinusAql(context, (yyvsp[-2].node), (yyvsp[0].node));
       if (node == NULL) {
@@ -2491,7 +2491,7 @@ yyreduce:
     break;
 
   case 66:
-#line 754 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 755 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryTimesAql(context, (yyvsp[-2].node), (yyvsp[0].node));
       if (node == NULL) {
@@ -2504,7 +2504,7 @@ yyreduce:
     break;
 
   case 67:
-#line 762 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 763 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryDivAql(context, (yyvsp[-2].node), (yyvsp[0].node));
       if (node == NULL) {
@@ -2517,7 +2517,7 @@ yyreduce:
     break;
 
   case 68:
-#line 770 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 771 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryModAql(context, (yyvsp[-2].node), (yyvsp[0].node));
       if (node == NULL) {
@@ -2530,7 +2530,7 @@ yyreduce:
     break;
 
   case 69:
-#line 778 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 779 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryEqAql(context, (yyvsp[-2].node), (yyvsp[0].node));
       if (node == NULL) {
@@ -2543,7 +2543,7 @@ yyreduce:
     break;
 
   case 70:
-#line 786 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 787 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryNeAql(context, (yyvsp[-2].node), (yyvsp[0].node));
       if (node == NULL) {
@@ -2556,7 +2556,7 @@ yyreduce:
     break;
 
   case 71:
-#line 794 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 795 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryLtAql(context, (yyvsp[-2].node), (yyvsp[0].node));
       if (node == NULL) {
@@ -2569,7 +2569,7 @@ yyreduce:
     break;
 
   case 72:
-#line 802 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 803 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryGtAql(context, (yyvsp[-2].node), (yyvsp[0].node));
       if (node == NULL) {
@@ -2582,7 +2582,7 @@ yyreduce:
     break;
 
   case 73:
-#line 810 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 811 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryLeAql(context, (yyvsp[-2].node), (yyvsp[0].node));
       if (node == NULL) {
@@ -2595,7 +2595,7 @@ yyreduce:
     break;
 
   case 74:
-#line 818 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 819 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryGeAql(context, (yyvsp[-2].node), (yyvsp[0].node));
       if (node == NULL) {
@@ -2608,7 +2608,7 @@ yyreduce:
     break;
 
   case 75:
-#line 826 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 827 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryInAql(context, (yyvsp[-2].node), (yyvsp[0].node));
       if (node == NULL) {
@@ -2621,7 +2621,7 @@ yyreduce:
     break;
 
   case 76:
-#line 837 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 838 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeOperatorTernaryAql(context, (yyvsp[-4].node), (yyvsp[-2].node), (yyvsp[0].node));
 
@@ -2635,21 +2635,21 @@ yyreduce:
     break;
 
   case 77:
-#line 849 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 850 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 2642 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 78:
-#line 851 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 852 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 2649 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 79:
-#line 856 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 857 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       if (! TRI_PushListAql(context, (yyvsp[0].node))) {
         ABORT_OOM
@@ -2659,7 +2659,7 @@ yyreduce:
     break;
 
   case 80:
-#line 861 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 862 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       if (! TRI_PushListAql(context, (yyvsp[0].node))) {
         ABORT_OOM
@@ -2669,7 +2669,7 @@ yyreduce:
     break;
 
   case 81:
-#line 869 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 870 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.node) = (yyvsp[0].node);
     }
@@ -2677,7 +2677,7 @@ yyreduce:
     break;
 
   case 82:
-#line 872 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 873 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.node) = (yyvsp[0].node);
     }
@@ -2685,7 +2685,7 @@ yyreduce:
     break;
 
   case 83:
-#line 878 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 879 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeListAql(context);
       if (node == NULL) {
@@ -2698,7 +2698,7 @@ yyreduce:
     break;
 
   case 84:
-#line 885 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 886 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.node) = static_cast<TRI_aql_node_t*>(TRI_PopStackParseAql(context));
     }
@@ -2706,21 +2706,21 @@ yyreduce:
     break;
 
   case 85:
-#line 891 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 892 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 2713 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 86:
-#line 893 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 894 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 2720 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 87:
-#line 898 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 899 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       if (! TRI_PushListAql(context, (yyvsp[0].node))) {
         ABORT_OOM
@@ -2730,7 +2730,7 @@ yyreduce:
     break;
 
   case 88:
-#line 903 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 904 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       if (! TRI_PushListAql(context, (yyvsp[0].node))) {
         ABORT_OOM
@@ -2740,7 +2740,7 @@ yyreduce:
     break;
 
   case 89:
-#line 911 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 912 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.node) = NULL;
     }
@@ -2748,7 +2748,7 @@ yyreduce:
     break;
 
   case 90:
-#line 914 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 915 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       if ((yyvsp[-1].strval) == NULL || (yyvsp[0].node) == NULL) {
         ABORT_OOM
@@ -2765,7 +2765,7 @@ yyreduce:
     break;
 
   case 91:
-#line 929 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 930 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeArrayAql(context);
       if (node == NULL) {
@@ -2778,7 +2778,7 @@ yyreduce:
     break;
 
   case 92:
-#line 936 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 937 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.node) = static_cast<TRI_aql_node_t*>(TRI_PopStackParseAql(context));
     }
@@ -2786,35 +2786,35 @@ yyreduce:
     break;
 
   case 93:
-#line 942 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 943 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 2793 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 94:
-#line 944 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 945 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 2800 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 95:
-#line 949 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 950 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 2807 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 96:
-#line 951 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 952 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 2814 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 97:
-#line 956 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 957 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       if (! TRI_PushArrayAql(context, (yyvsp[-2].strval), (yyvsp[0].node))) {
         ABORT_OOM
@@ -2824,7 +2824,7 @@ yyreduce:
     break;
 
   case 98:
-#line 964 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 965 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       // start of reference (collection or variable name)
       (yyval.node) = (yyvsp[0].node);
@@ -2833,7 +2833,7 @@ yyreduce:
     break;
 
   case 99:
-#line 968 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 969 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       // expanded variable access, e.g. variable[*]
       TRI_aql_node_t* node;
@@ -2863,7 +2863,7 @@ yyreduce:
     break;
 
   case 100:
-#line 992 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 993 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       // return from the "expansion" subrule
       TRI_aql_node_t* expanded = static_cast<TRI_aql_node_t*>(TRI_PopStackParseAql(context));
@@ -2899,7 +2899,7 @@ yyreduce:
     break;
 
   case 101:
-#line 1026 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1027 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       // variable or collection
       TRI_aql_node_t* node;
@@ -2921,7 +2921,7 @@ yyreduce:
     break;
 
   case 102:
-#line 1043 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1044 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.node) = (yyvsp[0].node);
       
@@ -2933,7 +2933,7 @@ yyreduce:
     break;
 
   case 103:
-#line 1050 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1051 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       // named variable access, e.g. variable.reference
       (yyval.node) = TRI_CreateNodeAttributeAccessAql(context, (yyvsp[-2].node), (yyvsp[0].strval));
@@ -2946,7 +2946,7 @@ yyreduce:
     break;
 
   case 104:
-#line 1058 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1059 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       // named variable access, e.g. variable.@reference
       (yyval.node) = TRI_CreateNodeBoundAttributeAccessAql(context, (yyvsp[-2].node), (yyvsp[0].node));
@@ -2959,7 +2959,7 @@ yyreduce:
     break;
 
   case 105:
-#line 1066 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1067 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       // indexed variable access, e.g. variable[index]
       (yyval.node) = TRI_CreateNodeIndexedAql(context, (yyvsp[-3].node), (yyvsp[-1].node));
@@ -2972,7 +2972,7 @@ yyreduce:
     break;
 
   case 106:
-#line 1077 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1078 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       // named variable access, continuation from * expansion, e.g. [*].variable.reference
       TRI_aql_node_t* node = static_cast<TRI_aql_node_t*>(TRI_PopStackParseAql(context));
@@ -2987,7 +2987,7 @@ yyreduce:
     break;
 
   case 107:
-#line 1087 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1088 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       // named variable access w/ bind parameter, continuation from * expansion, e.g. [*].variable.@reference
       TRI_aql_node_t* node = static_cast<TRI_aql_node_t*>(TRI_PopStackParseAql(context));
@@ -3002,7 +3002,7 @@ yyreduce:
     break;
 
   case 108:
-#line 1097 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1098 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       // indexed variable access, continuation from * expansion, e.g. [*].variable[index]
       TRI_aql_node_t* node = static_cast<TRI_aql_node_t*>(TRI_PopStackParseAql(context));
@@ -3017,7 +3017,7 @@ yyreduce:
     break;
 
   case 109:
-#line 1107 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1108 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       // named variable access, continuation from * expansion, e.g. [*].variable.xx.reference
       (yyval.node) = TRI_CreateNodeAttributeAccessAql(context, (yyvsp[-2].node), (yyvsp[0].strval));
@@ -3030,7 +3030,7 @@ yyreduce:
     break;
 
   case 110:
-#line 1115 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1116 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       // named variable access w/ bind parameter, continuation from * expansion, e.g. [*].variable.xx.@reference
       (yyval.node) = TRI_CreateNodeBoundAttributeAccessAql(context, (yyvsp[-2].node), (yyvsp[0].node));
@@ -3043,7 +3043,7 @@ yyreduce:
     break;
 
   case 111:
-#line 1123 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1124 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       // indexed variable access, continuation from * expansion, e.g. [*].variable.xx.[index]
       (yyval.node) = TRI_CreateNodeIndexedAql(context, (yyvsp[-3].node), (yyvsp[-1].node));
@@ -3056,7 +3056,7 @@ yyreduce:
     break;
 
   case 112:
-#line 1134 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1135 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.node) = (yyvsp[0].node);
     }
@@ -3064,7 +3064,7 @@ yyreduce:
     break;
 
   case 113:
-#line 1137 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1138 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.node) = (yyvsp[0].node);
     }
@@ -3072,7 +3072,7 @@ yyreduce:
     break;
 
   case 114:
-#line 1143 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1144 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.node) = (yyvsp[0].node);
     }
@@ -3080,7 +3080,7 @@ yyreduce:
     break;
 
   case 115:
-#line 1146 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1147 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node;
       double value;
@@ -3108,7 +3108,7 @@ yyreduce:
     break;
 
   case 116:
-#line 1171 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1172 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeValueStringAql(context, (yyvsp[0].strval));
 
@@ -3122,7 +3122,7 @@ yyreduce:
     break;
 
   case 117:
-#line 1180 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1181 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.node) = (yyvsp[0].node);
     }
@@ -3130,7 +3130,7 @@ yyreduce:
     break;
 
   case 118:
-#line 1183 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1184 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeValueNullAql(context);
 
@@ -3144,7 +3144,7 @@ yyreduce:
     break;
 
   case 119:
-#line 1192 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1193 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeValueBoolAql(context, true);
 
@@ -3158,7 +3158,7 @@ yyreduce:
     break;
 
   case 120:
-#line 1201 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1202 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeValueBoolAql(context, false);
 
@@ -3172,7 +3172,7 @@ yyreduce:
     break;
 
   case 121:
-#line 1213 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1214 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node;
 
@@ -3191,7 +3191,7 @@ yyreduce:
     break;
 
   case 122:
-#line 1227 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1228 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node;
 
@@ -3210,7 +3210,7 @@ yyreduce:
     break;
 
   case 123:
-#line 1241 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1242 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node;
 
@@ -3235,7 +3235,7 @@ yyreduce:
     break;
 
   case 124:
-#line 1264 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1265 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeParameterAql(context, (yyvsp[0].strval));
 
@@ -3249,7 +3249,7 @@ yyreduce:
     break;
 
   case 125:
-#line 1276 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1277 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       if ((yyvsp[0].strval) == NULL) {
         ABORT_OOM
@@ -3261,7 +3261,7 @@ yyreduce:
     break;
 
   case 126:
-#line 1283 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1284 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       if ((yyvsp[0].strval) == NULL) {
         ABORT_OOM
@@ -3273,7 +3273,7 @@ yyreduce:
     break;
 
   case 127:
-#line 1292 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1293 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.strval) = (yyvsp[0].strval);
     }
@@ -3281,7 +3281,7 @@ yyreduce:
     break;
 
   case 128:
-#line 1298 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1299 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node;
       int64_t value;
diff --git a/arangod/Ahuacatl/ahuacatl-grammar.cpp b/arangod/Ahuacatl/ahuacatl-grammar.cpp
index be65d9656b..330a2c523b 100644
--- a/arangod/Ahuacatl/ahuacatl-grammar.cpp
+++ b/arangod/Ahuacatl/ahuacatl-grammar.cpp
@@ -551,19 +551,19 @@ static const yytype_uint8 yytranslate[] =
   /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   192,   192,   195,   198,   201,   204,   210,   212,   217,
-     219,   221,   223,   225,   227,   232,   251,   264,   269,   271,
-     276,   290,   290,   315,   317,   322,   335,   338,   344,   344,
-     367,   372,   380,   391,   394,   397,   403,   414,   427,   444,
-     463,   482,   498,   517,   533,   552,   555,   555,   596,   599,
-     602,   605,   608,   611,   614,   645,   652,   666,   666,   695,
-     703,   711,   722,   730,   738,   746,   754,   762,   770,   778,
-     786,   794,   802,   810,   818,   826,   837,   849,   851,   856,
-     861,   869,   872,   878,   878,   891,   893,   898,   903,   911,
-     914,   929,   929,   942,   944,   949,   951,   956,   964,   968,
-     968,  1026,  1043,  1050,  1058,  1066,  1077,  1087,  1097,  1107,
-    1115,  1123,  1134,  1137,  1143,  1146,  1171,  1180,  1183,  1192,
-    1201,  1213,  1227,  1241,  1264,  1276,  1283,  1292,  1298
+       0,   193,   193,   196,   199,   202,   205,   211,   213,   218,
+     220,   222,   224,   226,   228,   233,   252,   265,   270,   272,
+     277,   291,   291,   316,   318,   323,   336,   339,   345,   345,
+     368,   373,   381,   392,   395,   398,   404,   415,   428,   445,
+     464,   483,   499,   518,   534,   553,   556,   556,   597,   600,
+     603,   606,   609,   612,   615,   646,   653,   667,   667,   696,
+     704,   712,   723,   731,   739,   747,   755,   763,   771,   779,
+     787,   795,   803,   811,   819,   827,   838,   850,   852,   857,
+     862,   870,   873,   879,   879,   892,   894,   899,   904,   912,
+     915,   930,   930,   943,   945,   950,   952,   957,   965,   969,
+     969,  1027,  1044,  1051,  1059,  1067,  1078,  1088,  1098,  1108,
+    1116,  1124,  1135,  1138,  1144,  1147,  1172,  1181,  1184,  1193,
+    1202,  1214,  1228,  1242,  1265,  1277,  1284,  1293,  1299
 };
 #endif
 
@@ -1683,7 +1683,7 @@ yyreduce:
   switch (yyn)
     {
         case 2:
-#line 192 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 193 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       context->_type = TRI_AQL_QUERY_READ;
     }
@@ -1691,7 +1691,7 @@ yyreduce:
     break;
 
   case 3:
-#line 195 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 196 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       context->_type = TRI_AQL_QUERY_REMOVE;
     }
@@ -1699,7 +1699,7 @@ yyreduce:
     break;
 
   case 4:
-#line 198 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 199 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       context->_type = TRI_AQL_QUERY_INSERT;
     }
@@ -1707,7 +1707,7 @@ yyreduce:
     break;
 
   case 5:
-#line 201 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 202 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       context->_type = TRI_AQL_QUERY_UPDATE;
     }
@@ -1715,7 +1715,7 @@ yyreduce:
     break;
 
   case 6:
-#line 204 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 205 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       context->_type = TRI_AQL_QUERY_REPLACE;
     }
@@ -1723,63 +1723,63 @@ yyreduce:
     break;
 
   case 7:
-#line 210 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 211 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 1730 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 8:
-#line 212 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 213 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 1737 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 9:
-#line 217 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 218 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 1744 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 10:
-#line 219 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 220 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 1751 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 11:
-#line 221 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 222 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 1758 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 12:
-#line 223 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 224 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 1765 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 13:
-#line 225 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 226 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 1772 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 14:
-#line 227 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 228 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 1779 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 15:
-#line 232 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 233 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node;
       
@@ -1800,7 +1800,7 @@ yyreduce:
     break;
 
   case 16:
-#line 251 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 252 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeFilterAql(context, (yyvsp[0].node));
       if (node == NULL) {
@@ -1815,28 +1815,28 @@ yyreduce:
     break;
 
   case 17:
-#line 264 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 265 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 1822 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 18:
-#line 269 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 270 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 1829 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 19:
-#line 271 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 272 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 1836 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 20:
-#line 276 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 277 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeLetAql(context, (yyvsp[-2].strval), (yyvsp[0].node));
 
@@ -1852,7 +1852,7 @@ yyreduce:
     break;
 
   case 21:
-#line 290 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 291 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeListAql(context);
       
@@ -1866,7 +1866,7 @@ yyreduce:
     break;
 
   case 22:
-#line 298 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 299 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeCollectAql(
                 context, 
@@ -1885,21 +1885,21 @@ yyreduce:
     break;
 
   case 23:
-#line 315 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 316 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 1892 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 24:
-#line 317 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 318 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 1899 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 25:
-#line 322 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 323 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeAssignAql(context, (yyvsp[-2].strval), (yyvsp[0].node));
       if (node == NULL) {
@@ -1914,7 +1914,7 @@ yyreduce:
     break;
 
   case 26:
-#line 335 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 336 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.strval) = NULL;
     }
@@ -1922,7 +1922,7 @@ yyreduce:
     break;
 
   case 27:
-#line 338 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 339 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.strval) = (yyvsp[0].strval);
     }
@@ -1930,7 +1930,7 @@ yyreduce:
     break;
 
   case 28:
-#line 344 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 345 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeListAql(context);
       
@@ -1944,7 +1944,7 @@ yyreduce:
     break;
 
   case 29:
-#line 352 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 353 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* list 
           = static_cast<TRI_aql_node_t*>(TRI_PopStackParseAql(context));
@@ -1961,7 +1961,7 @@ yyreduce:
     break;
 
   case 30:
-#line 367 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 368 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       if (! TRI_PushListAql(context, (yyvsp[0].node))) {
         ABORT_OOM
@@ -1971,7 +1971,7 @@ yyreduce:
     break;
 
   case 31:
-#line 372 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 373 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       if (! TRI_PushListAql(context, (yyvsp[0].node))) {
         ABORT_OOM
@@ -1981,7 +1981,7 @@ yyreduce:
     break;
 
   case 32:
-#line 380 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 381 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeSortElementAql(context, (yyvsp[-1].node), (yyvsp[0].boolval));
       if (node == NULL) {
@@ -1994,7 +1994,7 @@ yyreduce:
     break;
 
   case 33:
-#line 391 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 392 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.boolval) = true;
     }
@@ -2002,7 +2002,7 @@ yyreduce:
     break;
 
   case 34:
-#line 394 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 395 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.boolval) = true;
     }
@@ -2010,7 +2010,7 @@ yyreduce:
     break;
 
   case 35:
-#line 397 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 398 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.boolval) = false;
     }
@@ -2018,7 +2018,7 @@ yyreduce:
     break;
 
   case 36:
-#line 403 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 404 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeLimitAql(context, TRI_CreateNodeValueIntAql(context, 0), (yyvsp[0].node));
       if (node == NULL) {
@@ -2034,7 +2034,7 @@ yyreduce:
     break;
 
   case 37:
-#line 414 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 415 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeLimitAql(context, (yyvsp[-2].node), (yyvsp[0].node));
       if (node == NULL) {
@@ -2049,7 +2049,7 @@ yyreduce:
     break;
 
   case 38:
-#line 427 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 428 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeReturnAql(context, (yyvsp[0].node));
       if (node == NULL) {
@@ -2068,7 +2068,7 @@ yyreduce:
     break;
 
   case 39:
-#line 444 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 445 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node;
 
@@ -2089,7 +2089,7 @@ yyreduce:
     break;
 
   case 40:
-#line 463 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 464 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node;
 
@@ -2110,7 +2110,7 @@ yyreduce:
     break;
 
   case 41:
-#line 482 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 483 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node;
 
@@ -2131,7 +2131,7 @@ yyreduce:
     break;
 
   case 42:
-#line 498 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 499 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node;
 
@@ -2152,7 +2152,7 @@ yyreduce:
     break;
 
   case 43:
-#line 517 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 518 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node;
 
@@ -2173,7 +2173,7 @@ yyreduce:
     break;
 
   case 44:
-#line 533 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 534 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node;
 
@@ -2194,7 +2194,7 @@ yyreduce:
     break;
 
   case 45:
-#line 552 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 553 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.node) = (yyvsp[-1].node);
     }
@@ -2202,7 +2202,7 @@ yyreduce:
     break;
 
   case 46:
-#line 555 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 556 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       if (! TRI_StartScopeAql(context, TRI_AQL_SCOPE_SUBQUERY)) {
         ABORT_OOM
@@ -2215,7 +2215,7 @@ yyreduce:
     break;
 
   case 47:
-#line 562 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 563 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* result;
       TRI_aql_node_t* subQuery;
@@ -2254,7 +2254,7 @@ yyreduce:
     break;
 
   case 48:
-#line 596 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 597 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.node) = (yyvsp[0].node);
     }
@@ -2262,7 +2262,7 @@ yyreduce:
     break;
 
   case 49:
-#line 599 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 600 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.node) = (yyvsp[0].node);
     }
@@ -2270,7 +2270,7 @@ yyreduce:
     break;
 
   case 50:
-#line 602 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 603 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.node) = (yyvsp[0].node);
     }
@@ -2278,7 +2278,7 @@ yyreduce:
     break;
 
   case 51:
-#line 605 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 606 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.node) = (yyvsp[0].node);
     }
@@ -2286,7 +2286,7 @@ yyreduce:
     break;
 
   case 52:
-#line 608 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 609 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.node) = (yyvsp[0].node);
     }
@@ -2294,7 +2294,7 @@ yyreduce:
     break;
 
   case 53:
-#line 611 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 612 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.node) = (yyvsp[0].node);
     }
@@ -2302,7 +2302,7 @@ yyreduce:
     break;
 
   case 54:
-#line 614 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 615 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node;
       TRI_aql_node_t* list;
@@ -2335,7 +2335,7 @@ yyreduce:
     break;
 
   case 55:
-#line 645 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 646 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.strval) = (yyvsp[0].strval);
 
@@ -2347,7 +2347,7 @@ yyreduce:
     break;
 
   case 56:
-#line 652 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 653 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       if ((yyvsp[-2].strval) == NULL || (yyvsp[0].strval) == NULL) {
         ABORT_OOM
@@ -2363,7 +2363,7 @@ yyreduce:
     break;
 
   case 57:
-#line 666 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 667 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node;
 
@@ -2382,7 +2382,7 @@ yyreduce:
     break;
 
   case 58:
-#line 679 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 680 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* list 
         = static_cast<TRI_aql_node_t*>(TRI_PopStackParseAql(context));
@@ -2400,7 +2400,7 @@ yyreduce:
     break;
 
   case 59:
-#line 695 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 696 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeOperatorUnaryPlusAql(context, (yyvsp[0].node));
       if (node == NULL) {
@@ -2413,7 +2413,7 @@ yyreduce:
     break;
 
   case 60:
-#line 703 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 704 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeOperatorUnaryMinusAql(context, (yyvsp[0].node));
       if (node == NULL) {
@@ -2426,7 +2426,7 @@ yyreduce:
     break;
 
   case 61:
-#line 711 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 712 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     { 
       TRI_aql_node_t* node = TRI_CreateNodeOperatorUnaryNotAql(context, (yyvsp[0].node));
       if (node == NULL) {
@@ -2439,7 +2439,7 @@ yyreduce:
     break;
 
   case 62:
-#line 722 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 723 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryOrAql(context, (yyvsp[-2].node), (yyvsp[0].node));
       if (node == NULL) {
@@ -2452,7 +2452,7 @@ yyreduce:
     break;
 
   case 63:
-#line 730 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 731 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryAndAql(context, (yyvsp[-2].node), (yyvsp[0].node));
       if (node == NULL) {
@@ -2465,7 +2465,7 @@ yyreduce:
     break;
 
   case 64:
-#line 738 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 739 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryPlusAql(context, (yyvsp[-2].node), (yyvsp[0].node));
       if (node == NULL) {
@@ -2478,7 +2478,7 @@ yyreduce:
     break;
 
   case 65:
-#line 746 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 747 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryMinusAql(context, (yyvsp[-2].node), (yyvsp[0].node));
       if (node == NULL) {
@@ -2491,7 +2491,7 @@ yyreduce:
     break;
 
   case 66:
-#line 754 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 755 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryTimesAql(context, (yyvsp[-2].node), (yyvsp[0].node));
       if (node == NULL) {
@@ -2504,7 +2504,7 @@ yyreduce:
     break;
 
   case 67:
-#line 762 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 763 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryDivAql(context, (yyvsp[-2].node), (yyvsp[0].node));
       if (node == NULL) {
@@ -2517,7 +2517,7 @@ yyreduce:
     break;
 
   case 68:
-#line 770 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 771 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryModAql(context, (yyvsp[-2].node), (yyvsp[0].node));
       if (node == NULL) {
@@ -2530,7 +2530,7 @@ yyreduce:
     break;
 
   case 69:
-#line 778 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 779 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryEqAql(context, (yyvsp[-2].node), (yyvsp[0].node));
       if (node == NULL) {
@@ -2543,7 +2543,7 @@ yyreduce:
     break;
 
   case 70:
-#line 786 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 787 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryNeAql(context, (yyvsp[-2].node), (yyvsp[0].node));
       if (node == NULL) {
@@ -2556,7 +2556,7 @@ yyreduce:
     break;
 
   case 71:
-#line 794 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 795 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryLtAql(context, (yyvsp[-2].node), (yyvsp[0].node));
       if (node == NULL) {
@@ -2569,7 +2569,7 @@ yyreduce:
     break;
 
   case 72:
-#line 802 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 803 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryGtAql(context, (yyvsp[-2].node), (yyvsp[0].node));
       if (node == NULL) {
@@ -2582,7 +2582,7 @@ yyreduce:
     break;
 
   case 73:
-#line 810 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 811 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryLeAql(context, (yyvsp[-2].node), (yyvsp[0].node));
       if (node == NULL) {
@@ -2595,7 +2595,7 @@ yyreduce:
     break;
 
   case 74:
-#line 818 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 819 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryGeAql(context, (yyvsp[-2].node), (yyvsp[0].node));
       if (node == NULL) {
@@ -2608,7 +2608,7 @@ yyreduce:
     break;
 
   case 75:
-#line 826 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 827 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeOperatorBinaryInAql(context, (yyvsp[-2].node), (yyvsp[0].node));
       if (node == NULL) {
@@ -2621,7 +2621,7 @@ yyreduce:
     break;
 
   case 76:
-#line 837 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 838 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeOperatorTernaryAql(context, (yyvsp[-4].node), (yyvsp[-2].node), (yyvsp[0].node));
 
@@ -2635,21 +2635,21 @@ yyreduce:
     break;
 
   case 77:
-#line 849 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 850 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 2642 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 78:
-#line 851 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 852 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 2649 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 79:
-#line 856 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 857 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       if (! TRI_PushListAql(context, (yyvsp[0].node))) {
         ABORT_OOM
@@ -2659,7 +2659,7 @@ yyreduce:
     break;
 
   case 80:
-#line 861 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 862 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       if (! TRI_PushListAql(context, (yyvsp[0].node))) {
         ABORT_OOM
@@ -2669,7 +2669,7 @@ yyreduce:
     break;
 
   case 81:
-#line 869 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 870 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.node) = (yyvsp[0].node);
     }
@@ -2677,7 +2677,7 @@ yyreduce:
     break;
 
   case 82:
-#line 872 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 873 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.node) = (yyvsp[0].node);
     }
@@ -2685,7 +2685,7 @@ yyreduce:
     break;
 
   case 83:
-#line 878 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 879 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeListAql(context);
       if (node == NULL) {
@@ -2698,7 +2698,7 @@ yyreduce:
     break;
 
   case 84:
-#line 885 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 886 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.node) = static_cast<TRI_aql_node_t*>(TRI_PopStackParseAql(context));
     }
@@ -2706,21 +2706,21 @@ yyreduce:
     break;
 
   case 85:
-#line 891 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 892 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 2713 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 86:
-#line 893 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 894 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 2720 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 87:
-#line 898 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 899 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       if (! TRI_PushListAql(context, (yyvsp[0].node))) {
         ABORT_OOM
@@ -2730,7 +2730,7 @@ yyreduce:
     break;
 
   case 88:
-#line 903 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 904 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       if (! TRI_PushListAql(context, (yyvsp[0].node))) {
         ABORT_OOM
@@ -2740,7 +2740,7 @@ yyreduce:
     break;
 
   case 89:
-#line 911 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 912 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.node) = NULL;
     }
@@ -2748,7 +2748,7 @@ yyreduce:
     break;
 
   case 90:
-#line 914 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 915 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       if ((yyvsp[-1].strval) == NULL || (yyvsp[0].node) == NULL) {
         ABORT_OOM
@@ -2765,7 +2765,7 @@ yyreduce:
     break;
 
   case 91:
-#line 929 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 930 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeArrayAql(context);
       if (node == NULL) {
@@ -2778,7 +2778,7 @@ yyreduce:
     break;
 
   case 92:
-#line 936 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 937 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.node) = static_cast<TRI_aql_node_t*>(TRI_PopStackParseAql(context));
     }
@@ -2786,35 +2786,35 @@ yyreduce:
     break;
 
   case 93:
-#line 942 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 943 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 2793 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 94:
-#line 944 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 945 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 2800 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 95:
-#line 949 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 950 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 2807 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 96:
-#line 951 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 952 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
     }
 #line 2814 "arangod/Ahuacatl/ahuacatl-grammar.c" /* yacc.c:1646  */
     break;
 
   case 97:
-#line 956 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 957 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       if (! TRI_PushArrayAql(context, (yyvsp[-2].strval), (yyvsp[0].node))) {
         ABORT_OOM
@@ -2824,7 +2824,7 @@ yyreduce:
     break;
 
   case 98:
-#line 964 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 965 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       // start of reference (collection or variable name)
       (yyval.node) = (yyvsp[0].node);
@@ -2833,7 +2833,7 @@ yyreduce:
     break;
 
   case 99:
-#line 968 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 969 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       // expanded variable access, e.g. variable[*]
       TRI_aql_node_t* node;
@@ -2863,7 +2863,7 @@ yyreduce:
     break;
 
   case 100:
-#line 992 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 993 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       // return from the "expansion" subrule
       TRI_aql_node_t* expanded = static_cast<TRI_aql_node_t*>(TRI_PopStackParseAql(context));
@@ -2899,7 +2899,7 @@ yyreduce:
     break;
 
   case 101:
-#line 1026 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1027 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       // variable or collection
       TRI_aql_node_t* node;
@@ -2921,7 +2921,7 @@ yyreduce:
     break;
 
   case 102:
-#line 1043 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1044 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.node) = (yyvsp[0].node);
       
@@ -2933,7 +2933,7 @@ yyreduce:
     break;
 
   case 103:
-#line 1050 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1051 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       // named variable access, e.g. variable.reference
       (yyval.node) = TRI_CreateNodeAttributeAccessAql(context, (yyvsp[-2].node), (yyvsp[0].strval));
@@ -2946,7 +2946,7 @@ yyreduce:
     break;
 
   case 104:
-#line 1058 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1059 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       // named variable access, e.g. variable.@reference
       (yyval.node) = TRI_CreateNodeBoundAttributeAccessAql(context, (yyvsp[-2].node), (yyvsp[0].node));
@@ -2959,7 +2959,7 @@ yyreduce:
     break;
 
   case 105:
-#line 1066 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1067 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       // indexed variable access, e.g. variable[index]
       (yyval.node) = TRI_CreateNodeIndexedAql(context, (yyvsp[-3].node), (yyvsp[-1].node));
@@ -2972,7 +2972,7 @@ yyreduce:
     break;
 
   case 106:
-#line 1077 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1078 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       // named variable access, continuation from * expansion, e.g. [*].variable.reference
       TRI_aql_node_t* node = static_cast<TRI_aql_node_t*>(TRI_PopStackParseAql(context));
@@ -2987,7 +2987,7 @@ yyreduce:
     break;
 
   case 107:
-#line 1087 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1088 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       // named variable access w/ bind parameter, continuation from * expansion, e.g. [*].variable.@reference
       TRI_aql_node_t* node = static_cast<TRI_aql_node_t*>(TRI_PopStackParseAql(context));
@@ -3002,7 +3002,7 @@ yyreduce:
     break;
 
   case 108:
-#line 1097 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1098 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       // indexed variable access, continuation from * expansion, e.g. [*].variable[index]
       TRI_aql_node_t* node = static_cast<TRI_aql_node_t*>(TRI_PopStackParseAql(context));
@@ -3017,7 +3017,7 @@ yyreduce:
     break;
 
   case 109:
-#line 1107 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1108 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       // named variable access, continuation from * expansion, e.g. [*].variable.xx.reference
       (yyval.node) = TRI_CreateNodeAttributeAccessAql(context, (yyvsp[-2].node), (yyvsp[0].strval));
@@ -3030,7 +3030,7 @@ yyreduce:
     break;
 
   case 110:
-#line 1115 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1116 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       // named variable access w/ bind parameter, continuation from * expansion, e.g. [*].variable.xx.@reference
       (yyval.node) = TRI_CreateNodeBoundAttributeAccessAql(context, (yyvsp[-2].node), (yyvsp[0].node));
@@ -3043,7 +3043,7 @@ yyreduce:
     break;
 
   case 111:
-#line 1123 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1124 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       // indexed variable access, continuation from * expansion, e.g. [*].variable.xx.[index]
       (yyval.node) = TRI_CreateNodeIndexedAql(context, (yyvsp[-3].node), (yyvsp[-1].node));
@@ -3056,7 +3056,7 @@ yyreduce:
     break;
 
   case 112:
-#line 1134 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1135 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.node) = (yyvsp[0].node);
     }
@@ -3064,7 +3064,7 @@ yyreduce:
     break;
 
   case 113:
-#line 1137 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1138 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.node) = (yyvsp[0].node);
     }
@@ -3072,7 +3072,7 @@ yyreduce:
     break;
 
   case 114:
-#line 1143 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1144 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.node) = (yyvsp[0].node);
     }
@@ -3080,7 +3080,7 @@ yyreduce:
     break;
 
   case 115:
-#line 1146 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1147 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node;
       double value;
@@ -3108,7 +3108,7 @@ yyreduce:
     break;
 
   case 116:
-#line 1171 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1172 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeValueStringAql(context, (yyvsp[0].strval));
 
@@ -3122,7 +3122,7 @@ yyreduce:
     break;
 
   case 117:
-#line 1180 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1181 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.node) = (yyvsp[0].node);
     }
@@ -3130,7 +3130,7 @@ yyreduce:
     break;
 
   case 118:
-#line 1183 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1184 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeValueNullAql(context);
 
@@ -3144,7 +3144,7 @@ yyreduce:
     break;
 
   case 119:
-#line 1192 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1193 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeValueBoolAql(context, true);
 
@@ -3158,7 +3158,7 @@ yyreduce:
     break;
 
   case 120:
-#line 1201 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1202 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeValueBoolAql(context, false);
 
@@ -3172,7 +3172,7 @@ yyreduce:
     break;
 
   case 121:
-#line 1213 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1214 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node;
 
@@ -3191,7 +3191,7 @@ yyreduce:
     break;
 
   case 122:
-#line 1227 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1228 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node;
 
@@ -3210,7 +3210,7 @@ yyreduce:
     break;
 
   case 123:
-#line 1241 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1242 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node;
 
@@ -3235,7 +3235,7 @@ yyreduce:
     break;
 
   case 124:
-#line 1264 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1265 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node = TRI_CreateNodeParameterAql(context, (yyvsp[0].strval));
 
@@ -3249,7 +3249,7 @@ yyreduce:
     break;
 
   case 125:
-#line 1276 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1277 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       if ((yyvsp[0].strval) == NULL) {
         ABORT_OOM
@@ -3261,7 +3261,7 @@ yyreduce:
     break;
 
   case 126:
-#line 1283 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1284 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       if ((yyvsp[0].strval) == NULL) {
         ABORT_OOM
@@ -3273,7 +3273,7 @@ yyreduce:
     break;
 
   case 127:
-#line 1292 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1293 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       (yyval.strval) = (yyvsp[0].strval);
     }
@@ -3281,7 +3281,7 @@ yyreduce:
     break;
 
   case 128:
-#line 1298 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
+#line 1299 "arangod/Ahuacatl/ahuacatl-grammar.y" /* yacc.c:1646  */
     {
       TRI_aql_node_t* node;
       int64_t value;
diff --git a/arangod/Ahuacatl/ahuacatl-grammar.y b/arangod/Ahuacatl/ahuacatl-grammar.y
index da5e544f3f..41bb26ceab 100644
--- a/arangod/Ahuacatl/ahuacatl-grammar.y
+++ b/arangod/Ahuacatl/ahuacatl-grammar.y
@@ -130,7 +130,8 @@ void Ahuacatlerror (YYLTYPE* locp, TRI_aql_context_t* const context, const char*
 %left T_OR 
 %left T_AND
 %left T_EQ T_NE 
-%left T_IN T_INTO
+%left T_IN 
+%left T_INTO
 %left T_LT T_GT T_LE T_GE
 %left T_PLUS T_MINUS
 %left T_TIMES T_DIV T_MOD