layout_builders: Introduced ResolutionBMizer (for future refactoring)

[nit.git] / c_src / standard___collection___hash_collection._sep.c

diff --git a/c_src/standard___collection___hash_collection._sep.c b/c_src/standard___collection___hash_collection._sep.c
index 6f862cb..b0468ca 100644 (file)
--- a/c_src/standard___collection___hash_collection._sep.c
+++ b/c_src/standard___collection___hash_collection._sep.c
@@ -5,13 +5,14 @@ val_t standard___collection___hash_collection___HashCollection___first_item(val_
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 26;
+  fra.me.line = 27;
   fra.me.meth = LOCATE_standard___collection___hash_collection___HashCollection___first_item;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[0] = p0;
-  /* ./../lib/standard//collection//hash_collection.nit:26 */
+  /* ../lib/standard/collection/hash_collection.nit:27 */
   fra.me.REG[0] = ATTR_standard___collection___hash_collection___HashCollection____first_item(fra.me.REG[0]);
   stack_frame_head = fra.me.prev;
   return fra.me.REG[0];
@@ -24,41 +25,42 @@ val_t standard___collection___hash_collection___HashCollection___index_at(val_t
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 35;
+  fra.me.line = 36;
   fra.me.meth = LOCATE_standard___collection___hash_collection___HashCollection___index_at;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[1] = NIT_NULL;
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
-  /* ./../lib/standard//collection//hash_collection.nit:38 */
+  /* ../lib/standard/collection/hash_collection.nit:39 */
   REGB0 = CALL_standard___hash___Object___hash(fra.me.REG[1])(fra.me.REG[1]);
   REGB1 = TAG_Bool(ATTR_standard___collection___hash_collection___HashCollection____capacity(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_capacity", LOCATE_standard___collection___hash_collection, 38);
+    nit_abort("Uninitialized attribute %s", "_capacity", LOCATE_standard___collection___hash_collection, 39);
   }
   REGB1 = ATTR_standard___collection___hash_collection___HashCollection____capacity(fra.me.REG[0]);
-  /* ./../lib/standard//kernel.nit:223 */
+  /* ../lib/standard/kernel.nit:240 */
   REGB1 = TAG_Int(UNTAG_Int(REGB0)%UNTAG_Int(REGB1));
-  /* ./../lib/standard//collection//hash_collection.nit:39 */
+  /* ../lib/standard/collection/hash_collection.nit:40 */
   REGB0 = TAG_Int(0);
   REGB2 = TAG_Bool(VAL_ISA(REGB0, VTCOLOR_standard___kernel___Comparable___OTHER(REGB1), VTID_standard___kernel___Comparable___OTHER(REGB1))) /*cast OTHER*/;
   if (UNTAG_Bool(REGB2)) {
   } else {
     nit_abort("Cast failed", NULL, LOCATE_standard___kernel, 0);
   }
-  /* ./../lib/standard//kernel.nit:215 */
+  /* ../lib/standard/kernel.nit:232 */
   REGB0 = TAG_Bool(UNTAG_Int(REGB1)<UNTAG_Int(REGB0));
-  /* ./../lib/standard//collection//hash_collection.nit:39 */
+  /* ../lib/standard/collection/hash_collection.nit:40 */
   if (UNTAG_Bool(REGB0)) {
-    /* ./../lib/standard//kernel.nit:219 */
+    /* ../lib/standard/kernel.nit:236 */
     REGB0 = TAG_Int(-UNTAG_Int(REGB1));
-    /* ./../lib/standard//collection//hash_collection.nit:39 */
+    /* ../lib/standard/collection/hash_collection.nit:40 */
     REGB1 = REGB0;
   }
-  /* ./../lib/standard//collection//hash_collection.nit:40 */
+  /* ../lib/standard/collection/hash_collection.nit:41 */
   goto label1;
   label1: while(0);
   stack_frame_head = fra.me.prev;
@@ -70,31 +72,32 @@ val_t standard___collection___hash_collection___HashCollection___node_at(val_t p
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 43;
+  fra.me.line = 44;
   fra.me.meth = LOCATE_standard___collection___hash_collection___HashCollection___node_at;
   fra.me.has_broke = 0;
   fra.me.REG_size = 4;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[1] = NIT_NULL;
   fra.me.REG[2] = NIT_NULL;
   fra.me.REG[3] = NIT_NULL;
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
-  /* ./../lib/standard//collection//hash_collection.nit:47 */
+  /* ../lib/standard/collection/hash_collection.nit:48 */
   fra.me.REG[2] = ATTR_standard___collection___hash_collection___HashCollection____last_accessed_key(fra.me.REG[0]);
   REGB0 = TAG_Bool(IS_EQUAL_ON(fra.me.REG[1],fra.me.REG[2]));
   if (UNTAG_Bool(REGB0)) {
     fra.me.REG[2] = ATTR_standard___collection___hash_collection___HashCollection____last_accessed_node(fra.me.REG[0]);
     goto label1;
   }
-  /* ./../lib/standard//collection//hash_collection.nit:49 */
+  /* ../lib/standard/collection/hash_collection.nit:50 */
   REGB0 = CALL_standard___collection___hash_collection___HashCollection___index_at(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1]);
   fra.me.REG[3] = CALL_standard___collection___hash_collection___HashCollection___node_at_idx(fra.me.REG[0])(fra.me.REG[0], REGB0, fra.me.REG[1]);
-  /* ./../lib/standard//collection//hash_collection.nit:50 */
+  /* ../lib/standard/collection/hash_collection.nit:51 */
   ATTR_standard___collection___hash_collection___HashCollection____last_accessed_key(fra.me.REG[0]) = fra.me.REG[1];
-  /* ./../lib/standard//collection//hash_collection.nit:51 */
+  /* ../lib/standard/collection/hash_collection.nit:52 */
   ATTR_standard___collection___hash_collection___HashCollection____last_accessed_node(fra.me.REG[0]) = fra.me.REG[3];
-  /* ./../lib/standard//collection//hash_collection.nit:52 */
+  /* ../lib/standard/collection/hash_collection.nit:53 */
   fra.me.REG[2] = fra.me.REG[3];
   goto label1;
   label1: while(0);
@@ -109,25 +112,26 @@ val_t standard___collection___hash_collection___HashCollection___node_at_idx(val
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 55;
+  fra.me.line = 56;
   fra.me.meth = LOCATE_standard___collection___hash_collection___HashCollection___node_at_idx;
   fra.me.has_broke = 0;
   fra.me.REG_size = 3;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[1] = NIT_NULL;
   fra.me.REG[2] = NIT_NULL;
   fra.me.REG[0] = p0;
   REGB0 = p1;
   fra.me.REG[1] = p2;
-  /* ./../lib/standard//collection//hash_collection.nit:58 */
+  /* ../lib/standard/collection/hash_collection.nit:59 */
   fra.me.REG[0] = ATTR_standard___collection___hash_collection___HashCollection____array(fra.me.REG[0]);
   REGB1 = TAG_Bool(fra.me.REG[0]==NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
-    nit_abort("Reciever is null", NULL, LOCATE_standard___collection___hash_collection, 58);
+    nit_abort("Reciever is null", NULL, LOCATE_standard___collection___hash_collection, 59);
   }
-  /* ./../lib/standard//collection//array.nit:652 */
+  /* ../lib/standard/collection/array.nit:718 */
   fra.me.REG[0] = ((Nit_NativeArray)fra.me.REG[0])->val[UNTAG_Int(REGB0)];
-  /* ./../lib/standard//collection//hash_collection.nit:59 */
+  /* ../lib/standard/collection/hash_collection.nit:60 */
   while(1) {
     REGB0 = TAG_Bool(fra.me.REG[0]==NIT_NULL);
     if (UNTAG_Bool(REGB0)) {
@@ -143,14 +147,14 @@ val_t standard___collection___hash_collection___HashCollection___node_at_idx(val
     }
     REGB0 = TAG_Bool(!UNTAG_Bool(REGB0));
     if (UNTAG_Bool(REGB0)) {
-      /* ./../lib/standard//collection//hash_collection.nit:60 */
+      /* ../lib/standard/collection/hash_collection.nit:61 */
       REGB0 = TAG_Bool(ATTR_standard___collection___hash_collection___HashNode____key(fra.me.REG[0])!=NIT_NULL);
       if (UNTAG_Bool(REGB0)) {
       } else {
-        nit_abort("Uninitialized attribute %s", "_key", LOCATE_standard___collection___hash_collection, 60);
+        nit_abort("Uninitialized attribute %s", "_key", LOCATE_standard___collection___hash_collection, 61);
       }
       fra.me.REG[2] = ATTR_standard___collection___hash_collection___HashNode____key(fra.me.REG[0]);
-      /* ./../lib/standard//collection//hash_collection.nit:61 */
+      /* ../lib/standard/collection/hash_collection.nit:62 */
       REGB0 = TAG_Bool(IS_EQUAL_OO(fra.me.REG[2],fra.me.REG[1]));
       if (UNTAG_Bool(REGB0)) {
         REGB0 = TAG_Bool(true);
@@ -164,19 +168,19 @@ val_t standard___collection___hash_collection___HashCollection___node_at_idx(val
         REGB0 = REGB1;
       }
       if (UNTAG_Bool(REGB0)) {
-        /* ./../lib/standard//collection//hash_collection.nit:62 */
+        /* ../lib/standard/collection/hash_collection.nit:63 */
         goto label1;
       }
-      /* ./../lib/standard//collection//hash_collection.nit:64 */
+      /* ../lib/standard/collection/hash_collection.nit:65 */
       fra.me.REG[2] = ATTR_standard___collection___hash_collection___HashNode____next_in_bucklet(fra.me.REG[0]);
       fra.me.REG[0] = fra.me.REG[2];
     } else {
-      /* ./../lib/standard//collection//hash_collection.nit:59 */
+      /* ../lib/standard/collection/hash_collection.nit:60 */
       goto label1;
     }
   }
   label1: while(0);
-  /* ./../lib/standard//collection//hash_collection.nit:66 */
+  /* ../lib/standard/collection/hash_collection.nit:67 */
   goto label2;
   label2: while(0);
   stack_frame_head = fra.me.prev;
@@ -190,10 +194,11 @@ void standard___collection___hash_collection___HashCollection___store(val_t p0,
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 69;
+  fra.me.line = 70;
   fra.me.meth = LOCATE_standard___collection___hash_collection___HashCollection___store;
   fra.me.has_broke = 0;
   fra.me.REG_size = 4;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[1] = NIT_NULL;
   fra.me.REG[2] = NIT_NULL;
@@ -201,7 +206,7 @@ void standard___collection___hash_collection___HashCollection___store(val_t p0,
   fra.me.REG[0] = p0;
   REGB0 = p1;
   fra.me.REG[1] = p2;
-  /* ./../lib/standard//collection//hash_collection.nit:73 */
+  /* ../lib/standard/collection/hash_collection.nit:74 */
   fra.me.REG[2] = ATTR_standard___collection___hash_collection___HashCollection____first_item(fra.me.REG[0]);
   REGB1 = TAG_Bool(fra.me.REG[2]==NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
@@ -216,43 +221,43 @@ void standard___collection___hash_collection___HashCollection___store(val_t p0,
     }
   }
   if (UNTAG_Bool(REGB1)) {
-    /* ./../lib/standard//collection//hash_collection.nit:74 */
+    /* ../lib/standard/collection/hash_collection.nit:75 */
     ATTR_standard___collection___hash_collection___HashCollection____first_item(fra.me.REG[0]) = fra.me.REG[1];
   } else {
-    /* ./../lib/standard//collection//hash_collection.nit:76 */
+    /* ../lib/standard/collection/hash_collection.nit:77 */
     fra.me.REG[2] = ATTR_standard___collection___hash_collection___HashCollection____last_item(fra.me.REG[0]);
     REGB1 = TAG_Bool(fra.me.REG[2]==NIT_NULL);
     if (UNTAG_Bool(REGB1)) {
-      nit_abort("Reciever is null", NULL, LOCATE_standard___collection___hash_collection, 76);
+      nit_abort("Reciever is null", NULL, LOCATE_standard___collection___hash_collection, 77);
     }
     ATTR_standard___collection___hash_collection___HashNode____next_item(fra.me.REG[2]) = fra.me.REG[1];
   }
-  /* ./../lib/standard//collection//hash_collection.nit:78 */
+  /* ../lib/standard/collection/hash_collection.nit:79 */
   fra.me.REG[2] = ATTR_standard___collection___hash_collection___HashCollection____last_item(fra.me.REG[0]);
   ATTR_standard___collection___hash_collection___HashNode____prev_item(fra.me.REG[1]) = fra.me.REG[2];
-  /* ./../lib/standard//collection//hash_collection.nit:79 */
+  /* ../lib/standard/collection/hash_collection.nit:80 */
   ATTR_standard___collection___hash_collection___HashNode____next_item(fra.me.REG[1]) = NIT_NULL;
-  /* ./../lib/standard//collection//hash_collection.nit:80 */
+  /* ../lib/standard/collection/hash_collection.nit:81 */
   ATTR_standard___collection___hash_collection___HashCollection____last_item(fra.me.REG[0]) = fra.me.REG[1];
-  /* ./../lib/standard//collection//hash_collection.nit:83 */
+  /* ../lib/standard/collection/hash_collection.nit:84 */
   fra.me.REG[2] = ATTR_standard___collection___hash_collection___HashCollection____array(fra.me.REG[0]);
   REGB1 = TAG_Bool(fra.me.REG[2]==NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
-    nit_abort("Reciever is null", NULL, LOCATE_standard___collection___hash_collection, 83);
+    nit_abort("Reciever is null", NULL, LOCATE_standard___collection___hash_collection, 84);
   }
-  /* ./../lib/standard//collection//array.nit:652 */
+  /* ../lib/standard/collection/array.nit:718 */
   fra.me.REG[2] = ((Nit_NativeArray)fra.me.REG[2])->val[UNTAG_Int(REGB0)];
-  /* ./../lib/standard//collection//hash_collection.nit:84 */
+  /* ../lib/standard/collection/hash_collection.nit:85 */
   fra.me.REG[3] = ATTR_standard___collection___hash_collection___HashCollection____array(fra.me.REG[0]);
   REGB1 = TAG_Bool(fra.me.REG[3]==NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
-    nit_abort("Reciever is null", NULL, LOCATE_standard___collection___hash_collection, 84);
+    nit_abort("Reciever is null", NULL, LOCATE_standard___collection___hash_collection, 85);
   }
-  /* ./../lib/standard//collection//array.nit:653 */
+  /* ../lib/standard/collection/array.nit:719 */
   ((Nit_NativeArray)fra.me.REG[3])->val[UNTAG_Int(REGB0)]=fra.me.REG[1];
-  /* ./../lib/standard//collection//hash_collection.nit:85 */
+  /* ../lib/standard/collection/hash_collection.nit:86 */
   ATTR_standard___collection___hash_collection___HashNode____next_in_bucklet(fra.me.REG[1]) = fra.me.REG[2];
-  /* ./../lib/standard//collection//hash_collection.nit:86 */
+  /* ../lib/standard/collection/hash_collection.nit:87 */
   REGB0 = TAG_Bool(fra.me.REG[2]==NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
@@ -269,48 +274,48 @@ void standard___collection___hash_collection___HashCollection___store(val_t p0,
   if (UNTAG_Bool(REGB0)) {
     ATTR_standard___collection___hash_collection___HashNode____prev_in_bucklet(fra.me.REG[2]) = fra.me.REG[1];
   }
-  /* ./../lib/standard//collection//hash_collection.nit:88 */
+  /* ../lib/standard/collection/hash_collection.nit:89 */
   REGB0 = TAG_Bool(ATTR_standard___collection___hash_collection___HashNode____key(fra.me.REG[1])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_key", LOCATE_standard___collection___hash_collection, 88);
+    nit_abort("Uninitialized attribute %s", "_key", LOCATE_standard___collection___hash_collection, 89);
   }
   fra.me.REG[2] = ATTR_standard___collection___hash_collection___HashNode____key(fra.me.REG[1]);
   ATTR_standard___collection___hash_collection___HashCollection____last_accessed_key(fra.me.REG[0]) = fra.me.REG[2];
-  /* ./../lib/standard//collection//hash_collection.nit:89 */
+  /* ../lib/standard/collection/hash_collection.nit:90 */
   ATTR_standard___collection___hash_collection___HashCollection____last_accessed_node(fra.me.REG[0]) = fra.me.REG[1];
-  /* ./../lib/standard//collection//hash_collection.nit:92 */
+  /* ../lib/standard/collection/hash_collection.nit:93 */
   REGB0 = TAG_Bool(ATTR_standard___collection___hash_collection___HashCollection____length(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___hash_collection, 92);
+    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___hash_collection, 93);
   }
   REGB0 = ATTR_standard___collection___hash_collection___HashCollection____length(fra.me.REG[0]);
-  /* ./../lib/standard//collection//hash_collection.nit:93 */
+  /* ../lib/standard/collection/hash_collection.nit:94 */
   REGB1 = TAG_Int(1);
-  /* ./../lib/standard//kernel.nit:218 */
+  /* ../lib/standard/kernel.nit:235 */
   REGB1 = TAG_Int(UNTAG_Int(REGB0)+UNTAG_Int(REGB1));
-  /* ./../lib/standard//collection//hash_collection.nit:93 */
+  /* ../lib/standard/collection/hash_collection.nit:94 */
   ATTR_standard___collection___hash_collection___HashCollection____length(fra.me.REG[0]) = REGB1;
-  /* ./../lib/standard//collection//hash_collection.nit:94 */
+  /* ../lib/standard/collection/hash_collection.nit:95 */
   REGB1 = TAG_Int(5);
-  /* ./../lib/standard//kernel.nit:218 */
+  /* ../lib/standard/kernel.nit:235 */
   REGB1 = TAG_Int(UNTAG_Int(REGB0)+UNTAG_Int(REGB1));
-  /* ./../lib/standard//collection//hash_collection.nit:94 */
+  /* ../lib/standard/collection/hash_collection.nit:95 */
   REGB2 = TAG_Int(3);
-  /* ./../lib/standard//kernel.nit:221 */
+  /* ../lib/standard/kernel.nit:238 */
   REGB2 = TAG_Int(UNTAG_Int(REGB1)*UNTAG_Int(REGB2));
-  /* ./../lib/standard//collection//hash_collection.nit:94 */
+  /* ../lib/standard/collection/hash_collection.nit:95 */
   REGB1 = TAG_Int(2);
-  /* ./../lib/standard//kernel.nit:222 */
+  /* ../lib/standard/kernel.nit:239 */
   REGB1 = TAG_Int(UNTAG_Int(REGB2)/UNTAG_Int(REGB1));
-  /* ./../lib/standard//collection//hash_collection.nit:94 */
+  /* ../lib/standard/collection/hash_collection.nit:95 */
   REGB0 = REGB1;
-  /* ./../lib/standard//collection//hash_collection.nit:95 */
+  /* ../lib/standard/collection/hash_collection.nit:96 */
   REGB1 = TAG_Bool(ATTR_standard___collection___hash_collection___HashCollection____capacity(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_capacity", LOCATE_standard___collection___hash_collection, 95);
+    nit_abort("Uninitialized attribute %s", "_capacity", LOCATE_standard___collection___hash_collection, 96);
   }
   REGB1 = ATTR_standard___collection___hash_collection___HashCollection____capacity(fra.me.REG[0]);
   REGB2 = TAG_Bool(VAL_ISA(REGB1, VTCOLOR_standard___kernel___Comparable___OTHER(REGB0), VTID_standard___kernel___Comparable___OTHER(REGB0))) /*cast OTHER*/;
@@ -318,15 +323,15 @@ void standard___collection___hash_collection___HashCollection___store(val_t p0,
   } else {
     nit_abort("Cast failed", NULL, LOCATE_standard___kernel, 0);
   }
-  /* ./../lib/standard//kernel.nit:216 */
+  /* ../lib/standard/kernel.nit:233 */
   REGB1 = TAG_Bool(UNTAG_Int(REGB0)>=UNTAG_Int(REGB1));
-  /* ./../lib/standard//collection//hash_collection.nit:95 */
+  /* ../lib/standard/collection/hash_collection.nit:96 */
   if (UNTAG_Bool(REGB1)) {
-    /* ./../lib/standard//collection//hash_collection.nit:96 */
+    /* ../lib/standard/collection/hash_collection.nit:97 */
     REGB1 = TAG_Int(2);
-    /* ./../lib/standard//kernel.nit:221 */
+    /* ../lib/standard/kernel.nit:238 */
     REGB1 = TAG_Int(UNTAG_Int(REGB0)*UNTAG_Int(REGB1));
-    /* ./../lib/standard//collection//hash_collection.nit:96 */
+    /* ../lib/standard/collection/hash_collection.nit:97 */
     CALL_standard___collection___hash_collection___HashCollection___enlarge(fra.me.REG[0])(fra.me.REG[0], REGB1);
   }
   stack_frame_head = fra.me.prev;
@@ -340,10 +345,11 @@ void standard___collection___hash_collection___HashCollection___remove_node(val_
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 100;
+  fra.me.line = 101;
   fra.me.meth = LOCATE_standard___collection___hash_collection___HashCollection___remove_node;
   fra.me.has_broke = 0;
   fra.me.REG_size = 5;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[1] = NIT_NULL;
   fra.me.REG[2] = NIT_NULL;
@@ -351,11 +357,11 @@ void standard___collection___hash_collection___HashCollection___remove_node(val_
   fra.me.REG[4] = NIT_NULL;
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
-  /* ./../lib/standard//collection//hash_collection.nit:103 */
+  /* ../lib/standard/collection/hash_collection.nit:104 */
   REGB0 = CALL_standard___collection___hash_collection___HashCollection___index_at(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1]);
-  /* ./../lib/standard//collection//hash_collection.nit:104 */
+  /* ../lib/standard/collection/hash_collection.nit:105 */
   fra.me.REG[1] = CALL_standard___collection___hash_collection___HashCollection___node_at_idx(fra.me.REG[0])(fra.me.REG[0], REGB0, fra.me.REG[1]);
-  /* ./../lib/standard//collection//hash_collection.nit:105 */
+  /* ../lib/standard/collection/hash_collection.nit:106 */
   REGB1 = TAG_Bool(fra.me.REG[1]==NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
   } else {
@@ -371,11 +377,11 @@ void standard___collection___hash_collection___HashCollection___remove_node(val_
   if (UNTAG_Bool(REGB1)) {
     goto label1;
   }
-  /* ./../lib/standard//collection//hash_collection.nit:108 */
+  /* ../lib/standard/collection/hash_collection.nit:109 */
   fra.me.REG[2] = ATTR_standard___collection___hash_collection___HashNode____prev_item(fra.me.REG[1]);
-  /* ./../lib/standard//collection//hash_collection.nit:109 */
+  /* ../lib/standard/collection/hash_collection.nit:110 */
   fra.me.REG[3] = ATTR_standard___collection___hash_collection___HashNode____next_item(fra.me.REG[1]);
-  /* ./../lib/standard//collection//hash_collection.nit:110 */
+  /* ../lib/standard/collection/hash_collection.nit:111 */
   REGB1 = TAG_Bool(fra.me.REG[2]==NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
   } else {
@@ -390,13 +396,13 @@ void standard___collection___hash_collection___HashCollection___remove_node(val_
   }
   REGB1 = TAG_Bool(!UNTAG_Bool(REGB1));
   if (UNTAG_Bool(REGB1)) {
-    /* ./../lib/standard//collection//hash_collection.nit:111 */
+    /* ../lib/standard/collection/hash_collection.nit:112 */
     ATTR_standard___collection___hash_collection___HashNode____next_item(fra.me.REG[2]) = fra.me.REG[3];
   } else {
-    /* ./../lib/standard//collection//hash_collection.nit:113 */
+    /* ../lib/standard/collection/hash_collection.nit:114 */
     ATTR_standard___collection___hash_collection___HashCollection____first_item(fra.me.REG[0]) = fra.me.REG[3];
   }
-  /* ./../lib/standard//collection//hash_collection.nit:115 */
+  /* ../lib/standard/collection/hash_collection.nit:116 */
   REGB1 = TAG_Bool(fra.me.REG[3]==NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
   } else {
@@ -411,26 +417,26 @@ void standard___collection___hash_collection___HashCollection___remove_node(val_
   }
   REGB1 = TAG_Bool(!UNTAG_Bool(REGB1));
   if (UNTAG_Bool(REGB1)) {
-    /* ./../lib/standard//collection//hash_collection.nit:116 */
+    /* ../lib/standard/collection/hash_collection.nit:117 */
     ATTR_standard___collection___hash_collection___HashNode____prev_item(fra.me.REG[3]) = fra.me.REG[2];
   } else {
-    /* ./../lib/standard//collection//hash_collection.nit:118 */
+    /* ../lib/standard/collection/hash_collection.nit:119 */
     ATTR_standard___collection___hash_collection___HashCollection____last_item(fra.me.REG[0]) = fra.me.REG[2];
   }
-  /* ./../lib/standard//collection//hash_collection.nit:122 */
+  /* ../lib/standard/collection/hash_collection.nit:123 */
   REGB1 = ATTR_standard___collection___hash_collection___HashCollection____length(fra.me.REG[0]);
   REGB2 = TAG_Int(1);
-  /* ./../lib/standard//kernel.nit:220 */
+  /* ../lib/standard/kernel.nit:237 */
   REGB2 = TAG_Int(UNTAG_Int(REGB1)-UNTAG_Int(REGB2));
-  /* ./../lib/standard//collection//hash_collection.nit:122 */
+  /* ../lib/standard/collection/hash_collection.nit:123 */
   ATTR_standard___collection___hash_collection___HashCollection____length(fra.me.REG[0]) = REGB2;
-  /* ./../lib/standard//collection//hash_collection.nit:123 */
+  /* ../lib/standard/collection/hash_collection.nit:124 */
   fra.me.REG[4] = ATTR_standard___collection___hash_collection___HashNode____prev_in_bucklet(fra.me.REG[1]);
   fra.me.REG[2] = fra.me.REG[4];
-  /* ./../lib/standard//collection//hash_collection.nit:124 */
+  /* ../lib/standard/collection/hash_collection.nit:125 */
   fra.me.REG[1] = ATTR_standard___collection___hash_collection___HashNode____next_in_bucklet(fra.me.REG[1]);
   fra.me.REG[3] = fra.me.REG[1];
-  /* ./../lib/standard//collection//hash_collection.nit:125 */
+  /* ../lib/standard/collection/hash_collection.nit:126 */
   REGB2 = TAG_Bool(fra.me.REG[2]==NIT_NULL);
   if (UNTAG_Bool(REGB2)) {
   } else {
@@ -445,19 +451,19 @@ void standard___collection___hash_collection___HashCollection___remove_node(val_
   }
   REGB2 = TAG_Bool(!UNTAG_Bool(REGB2));
   if (UNTAG_Bool(REGB2)) {
-    /* ./../lib/standard//collection//hash_collection.nit:126 */
+    /* ../lib/standard/collection/hash_collection.nit:127 */
     ATTR_standard___collection___hash_collection___HashNode____next_in_bucklet(fra.me.REG[2]) = fra.me.REG[3];
   } else {
-    /* ./../lib/standard//collection//hash_collection.nit:128 */
+    /* ../lib/standard/collection/hash_collection.nit:129 */
     fra.me.REG[1] = ATTR_standard___collection___hash_collection___HashCollection____array(fra.me.REG[0]);
     REGB2 = TAG_Bool(fra.me.REG[1]==NIT_NULL);
     if (UNTAG_Bool(REGB2)) {
-      nit_abort("Reciever is null", NULL, LOCATE_standard___collection___hash_collection, 128);
+      nit_abort("Reciever is null", NULL, LOCATE_standard___collection___hash_collection, 129);
     }
-    /* ./../lib/standard//collection//array.nit:653 */
+    /* ../lib/standard/collection/array.nit:719 */
     ((Nit_NativeArray)fra.me.REG[1])->val[UNTAG_Int(REGB0)]=fra.me.REG[3];
   }
-  /* ./../lib/standard//collection//hash_collection.nit:130 */
+  /* ../lib/standard/collection/hash_collection.nit:131 */
   REGB0 = TAG_Bool(fra.me.REG[3]==NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
@@ -472,10 +478,10 @@ void standard___collection___hash_collection___HashCollection___remove_node(val_
   }
   REGB0 = TAG_Bool(!UNTAG_Bool(REGB0));
   if (UNTAG_Bool(REGB0)) {
-    /* ./../lib/standard//collection//hash_collection.nit:131 */
+    /* ../lib/standard/collection/hash_collection.nit:132 */
     ATTR_standard___collection___hash_collection___HashNode____prev_in_bucklet(fra.me.REG[3]) = fra.me.REG[2];
   }
-  /* ./../lib/standard//collection//hash_collection.nit:134 */
+  /* ../lib/standard/collection/hash_collection.nit:135 */
   ATTR_standard___collection___hash_collection___HashCollection____last_accessed_key(fra.me.REG[0]) = NIT_NULL;
   label1: while(0);
   stack_frame_head = fra.me.prev;
@@ -489,24 +495,25 @@ void standard___collection___hash_collection___HashCollection___raz(val_t p0){
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 137;
+  fra.me.line = 138;
   fra.me.meth = LOCATE_standard___collection___hash_collection___HashCollection___raz;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[1] = NIT_NULL;
   fra.me.REG[0] = p0;
-  /* ./../lib/standard//collection//hash_collection.nit:139 */
+  /* ../lib/standard/collection/hash_collection.nit:141 */
   REGB0 = TAG_Bool(ATTR_standard___collection___hash_collection___HashCollection____capacity(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_capacity", LOCATE_standard___collection___hash_collection, 139);
+    nit_abort("Uninitialized attribute %s", "_capacity", LOCATE_standard___collection___hash_collection, 141);
   }
   REGB0 = ATTR_standard___collection___hash_collection___HashCollection____capacity(fra.me.REG[0]);
   REGB1 = TAG_Int(1);
-  /* ./../lib/standard//kernel.nit:220 */
+  /* ../lib/standard/kernel.nit:237 */
   REGB1 = TAG_Int(UNTAG_Int(REGB0)-UNTAG_Int(REGB1));
-  /* ./../lib/standard//collection//hash_collection.nit:140 */
+  /* ../lib/standard/collection/hash_collection.nit:142 */
   while(1) {
     REGB0 = TAG_Int(0);
     REGB2 = TAG_Bool(VAL_ISA(REGB0, VTCOLOR_standard___kernel___Comparable___OTHER(REGB1), VTID_standard___kernel___Comparable___OTHER(REGB1))) /*cast OTHER*/;
@@ -514,38 +521,38 @@ void standard___collection___hash_collection___HashCollection___raz(val_t p0){
     } else {
       nit_abort("Cast failed", NULL, LOCATE_standard___kernel, 0);
     }
-    /* ./../lib/standard//kernel.nit:216 */
+    /* ../lib/standard/kernel.nit:233 */
     REGB0 = TAG_Bool(UNTAG_Int(REGB1)>=UNTAG_Int(REGB0));
-    /* ./../lib/standard//collection//hash_collection.nit:140 */
+    /* ../lib/standard/collection/hash_collection.nit:142 */
     if (UNTAG_Bool(REGB0)) {
-      /* ./../lib/standard//collection//hash_collection.nit:141 */
+      /* ../lib/standard/collection/hash_collection.nit:143 */
       fra.me.REG[1] = ATTR_standard___collection___hash_collection___HashCollection____array(fra.me.REG[0]);
       REGB0 = TAG_Bool(fra.me.REG[1]==NIT_NULL);
       if (UNTAG_Bool(REGB0)) {
-        nit_abort("Reciever is null", NULL, LOCATE_standard___collection___hash_collection, 141);
+        nit_abort("Reciever is null", NULL, LOCATE_standard___collection___hash_collection, 143);
       }
-      /* ./../lib/standard//collection//array.nit:653 */
+      /* ../lib/standard/collection/array.nit:719 */
       ((Nit_NativeArray)fra.me.REG[1])->val[UNTAG_Int(REGB1)]=NIT_NULL;
-      /* ./../lib/standard//collection//hash_collection.nit:142 */
+      /* ../lib/standard/collection/hash_collection.nit:144 */
       REGB0 = TAG_Int(1);
-      /* ./../lib/standard//kernel.nit:220 */
+      /* ../lib/standard/kernel.nit:237 */
       REGB0 = TAG_Int(UNTAG_Int(REGB1)-UNTAG_Int(REGB0));
-      /* ./../lib/standard//collection//hash_collection.nit:142 */
+      /* ../lib/standard/collection/hash_collection.nit:144 */
       REGB1 = REGB0;
     } else {
-      /* ./../lib/standard//collection//hash_collection.nit:140 */
+      /* ../lib/standard/collection/hash_collection.nit:142 */
       goto label1;
     }
   }
   label1: while(0);
-  /* ./../lib/standard//collection//hash_collection.nit:144 */
+  /* ../lib/standard/collection/hash_collection.nit:146 */
   REGB1 = TAG_Int(0);
   ATTR_standard___collection___hash_collection___HashCollection____length(fra.me.REG[0]) = REGB1;
-  /* ./../lib/standard//collection//hash_collection.nit:145 */
+  /* ../lib/standard/collection/hash_collection.nit:147 */
   ATTR_standard___collection___hash_collection___HashCollection____first_item(fra.me.REG[0]) = NIT_NULL;
-  /* ./../lib/standard//collection//hash_collection.nit:146 */
+  /* ../lib/standard/collection/hash_collection.nit:148 */
   ATTR_standard___collection___hash_collection___HashCollection____last_item(fra.me.REG[0]) = NIT_NULL;
-  /* ./../lib/standard//collection//hash_collection.nit:147 */
+  /* ../lib/standard/collection/hash_collection.nit:149 */
   ATTR_standard___collection___hash_collection___HashCollection____last_accessed_key(fra.me.REG[0]) = NIT_NULL;
   stack_frame_head = fra.me.prev;
   return;
@@ -559,59 +566,60 @@ void standard___collection___hash_collection___HashCollection___enlarge(val_t p0
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 150;
+  fra.me.line = 152;
   fra.me.meth = LOCATE_standard___collection___hash_collection___HashCollection___enlarge;
   fra.me.has_broke = 0;
   fra.me.REG_size = 4;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[1] = NIT_NULL;
   fra.me.REG[2] = NIT_NULL;
   fra.me.REG[3] = NIT_NULL;
   fra.me.REG[0] = p0;
   REGB0 = p1;
-  /* ./../lib/standard//collection//hash_collection.nit:152 */
+  /* ../lib/standard/collection/hash_collection.nit:155 */
   REGB1 = TAG_Bool(ATTR_standard___collection___hash_collection___HashCollection____capacity(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_capacity", LOCATE_standard___collection___hash_collection, 152);
+    nit_abort("Uninitialized attribute %s", "_capacity", LOCATE_standard___collection___hash_collection, 155);
   }
   REGB1 = ATTR_standard___collection___hash_collection___HashCollection____capacity(fra.me.REG[0]);
-  /* ./../lib/standard//collection//hash_collection.nit:154 */
+  /* ../lib/standard/collection/hash_collection.nit:157 */
   REGB2 = TAG_Bool(ATTR_standard___collection___hash_collection___HashCollection____length(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB2)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___hash_collection, 154);
+    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___hash_collection, 157);
   }
   REGB2 = ATTR_standard___collection___hash_collection___HashCollection____length(fra.me.REG[0]);
   REGB3 = TAG_Int(1);
-  /* ./../lib/standard//kernel.nit:218 */
+  /* ../lib/standard/kernel.nit:235 */
   REGB3 = TAG_Int(UNTAG_Int(REGB2)+UNTAG_Int(REGB3));
   REGB2 = TAG_Bool(VAL_ISA(REGB3, VTCOLOR_standard___kernel___Comparable___OTHER(REGB0), VTID_standard___kernel___Comparable___OTHER(REGB0))) /*cast OTHER*/;
   if (UNTAG_Bool(REGB2)) {
   } else {
     nit_abort("Cast failed", NULL, LOCATE_standard___kernel, 0);
   }
-  /* ./../lib/standard//kernel.nit:215 */
+  /* ../lib/standard/kernel.nit:232 */
   REGB3 = TAG_Bool(UNTAG_Int(REGB0)<UNTAG_Int(REGB3));
-  /* ./../lib/standard//collection//hash_collection.nit:154 */
+  /* ../lib/standard/collection/hash_collection.nit:157 */
   if (UNTAG_Bool(REGB3)) {
     REGB3 = TAG_Bool(ATTR_standard___collection___hash_collection___HashCollection____length(fra.me.REG[0])!=NIT_NULL);
     if (UNTAG_Bool(REGB3)) {
     } else {
-      nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___hash_collection, 154);
+      nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___hash_collection, 157);
     }
     REGB3 = ATTR_standard___collection___hash_collection___HashCollection____length(fra.me.REG[0]);
     REGB2 = TAG_Int(1);
-    /* ./../lib/standard//kernel.nit:218 */
+    /* ../lib/standard/kernel.nit:235 */
     REGB2 = TAG_Int(UNTAG_Int(REGB3)+UNTAG_Int(REGB2));
-    /* ./../lib/standard//collection//hash_collection.nit:154 */
+    /* ../lib/standard/collection/hash_collection.nit:157 */
     REGB0 = REGB2;
   }
-  /* ./../lib/standard//collection//hash_collection.nit:155 */
+  /* ../lib/standard/collection/hash_collection.nit:158 */
   REGB2 = TAG_Bool(ATTR_standard___collection___hash_collection___HashCollection____capacity(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB2)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_capacity", LOCATE_standard___collection___hash_collection, 155);
+    nit_abort("Uninitialized attribute %s", "_capacity", LOCATE_standard___collection___hash_collection, 158);
   }
   REGB2 = ATTR_standard___collection___hash_collection___HashCollection____capacity(fra.me.REG[0]);
   REGB3 = TAG_Bool(VAL_ISA(REGB2, VTCOLOR_standard___kernel___Comparable___OTHER(REGB0), VTID_standard___kernel___Comparable___OTHER(REGB0))) /*cast OTHER*/;
@@ -619,25 +627,25 @@ void standard___collection___hash_collection___HashCollection___enlarge(val_t p0
   } else {
     nit_abort("Cast failed", NULL, LOCATE_standard___kernel, 0);
   }
-  /* ./../lib/standard//kernel.nit:214 */
+  /* ../lib/standard/kernel.nit:231 */
   REGB2 = TAG_Bool(UNTAG_Int(REGB0)<=UNTAG_Int(REGB2));
-  /* ./../lib/standard//collection//hash_collection.nit:155 */
+  /* ../lib/standard/collection/hash_collection.nit:158 */
   if (UNTAG_Bool(REGB2)) {
     goto label1;
   }
-  /* ./../lib/standard//collection//hash_collection.nit:156 */
+  /* ../lib/standard/collection/hash_collection.nit:159 */
   ATTR_standard___collection___hash_collection___HashCollection____capacity(fra.me.REG[0]) = REGB0;
-  /* ./../lib/standard//collection//hash_collection.nit:157 */
+  /* ../lib/standard/collection/hash_collection.nit:160 */
   ATTR_standard___collection___hash_collection___HashCollection____last_accessed_key(fra.me.REG[0]) = NIT_NULL;
-  /* ./../lib/standard//collection//array.nit:646 */
+  /* ../lib/standard/collection/array.nit:712 */
   fra.me.REG[1] = NEW_NativeArray(UNTAG_Int(REGB0), sizeof(val_t));
-  /* ./../lib/standard//collection//hash_collection.nit:161 */
+  /* ../lib/standard/collection/hash_collection.nit:164 */
   ATTR_standard___collection___hash_collection___HashCollection____array(fra.me.REG[0]) = fra.me.REG[1];
-  /* ./../lib/standard//collection//hash_collection.nit:164 */
+  /* ../lib/standard/collection/hash_collection.nit:167 */
   REGB2 = TAG_Int(1);
-  /* ./../lib/standard//kernel.nit:220 */
+  /* ../lib/standard/kernel.nit:237 */
   REGB2 = TAG_Int(UNTAG_Int(REGB0)-UNTAG_Int(REGB2));
-  /* ./../lib/standard//collection//hash_collection.nit:165 */
+  /* ../lib/standard/collection/hash_collection.nit:168 */
   while(1) {
     REGB0 = TAG_Int(0);
     REGB3 = TAG_Bool(VAL_ISA(REGB0, VTCOLOR_standard___kernel___Comparable___OTHER(REGB2), VTID_standard___kernel___Comparable___OTHER(REGB2))) /*cast OTHER*/;
@@ -645,29 +653,29 @@ void standard___collection___hash_collection___HashCollection___enlarge(val_t p0
     } else {
       nit_abort("Cast failed", NULL, LOCATE_standard___kernel, 0);
     }
-    /* ./../lib/standard//kernel.nit:216 */
+    /* ../lib/standard/kernel.nit:233 */
     REGB0 = TAG_Bool(UNTAG_Int(REGB2)>=UNTAG_Int(REGB0));
-    /* ./../lib/standard//collection//hash_collection.nit:165 */
+    /* ../lib/standard/collection/hash_collection.nit:168 */
     if (UNTAG_Bool(REGB0)) {
-      /* ./../lib/standard//collection//array.nit:653 */
+      /* ../lib/standard/collection/array.nit:719 */
       ((Nit_NativeArray)fra.me.REG[1])->val[UNTAG_Int(REGB2)]=NIT_NULL;
-      /* ./../lib/standard//collection//hash_collection.nit:167 */
+      /* ../lib/standard/collection/hash_collection.nit:170 */
       REGB0 = TAG_Int(1);
-      /* ./../lib/standard//kernel.nit:220 */
+      /* ../lib/standard/kernel.nit:237 */
       REGB0 = TAG_Int(UNTAG_Int(REGB2)-UNTAG_Int(REGB0));
-      /* ./../lib/standard//collection//hash_collection.nit:167 */
+      /* ../lib/standard/collection/hash_collection.nit:170 */
       REGB2 = REGB0;
     } else {
-      /* ./../lib/standard//collection//hash_collection.nit:165 */
+      /* ../lib/standard/collection/hash_collection.nit:168 */
       goto label2;
     }
   }
   label2: while(0);
-  /* ./../lib/standard//collection//hash_collection.nit:170 */
+  /* ../lib/standard/collection/hash_collection.nit:173 */
   REGB2 = TAG_Bool(ATTR_standard___collection___hash_collection___HashCollection____capacity(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB2)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_capacity", LOCATE_standard___collection___hash_collection, 170);
+    nit_abort("Uninitialized attribute %s", "_capacity", LOCATE_standard___collection___hash_collection, 173);
   }
   REGB2 = ATTR_standard___collection___hash_collection___HashCollection____capacity(fra.me.REG[0]);
   REGB0 = TAG_Bool(VAL_ISA(REGB1, VTCOLOR_standard___kernel___Comparable___OTHER(REGB2), VTID_standard___kernel___Comparable___OTHER(REGB2))) /*cast OTHER*/;
@@ -675,15 +683,15 @@ void standard___collection___hash_collection___HashCollection___enlarge(val_t p0
   } else {
     nit_abort("Cast failed", NULL, LOCATE_standard___kernel, 0);
   }
-  /* ./../lib/standard//kernel.nit:214 */
+  /* ../lib/standard/kernel.nit:231 */
   REGB1 = TAG_Bool(UNTAG_Int(REGB2)<=UNTAG_Int(REGB1));
-  /* ./../lib/standard//collection//hash_collection.nit:170 */
+  /* ../lib/standard/collection/hash_collection.nit:173 */
   if (UNTAG_Bool(REGB1)) {
     goto label1;
   }
-  /* ./../lib/standard//collection//hash_collection.nit:173 */
+  /* ../lib/standard/collection/hash_collection.nit:176 */
   fra.me.REG[2] = ATTR_standard___collection___hash_collection___HashCollection____first_item(fra.me.REG[0]);
-  /* ./../lib/standard//collection//hash_collection.nit:174 */
+  /* ../lib/standard/collection/hash_collection.nit:177 */
   while(1) {
     REGB1 = TAG_Bool(fra.me.REG[2]==NIT_NULL);
     if (UNTAG_Bool(REGB1)) {
@@ -699,21 +707,21 @@ void standard___collection___hash_collection___HashCollection___enlarge(val_t p0
     }
     REGB1 = TAG_Bool(!UNTAG_Bool(REGB1));
     if (UNTAG_Bool(REGB1)) {
-      /* ./../lib/standard//collection//hash_collection.nit:175 */
+      /* ../lib/standard/collection/hash_collection.nit:178 */
       REGB1 = TAG_Bool(ATTR_standard___collection___hash_collection___HashNode____key(fra.me.REG[2])!=NIT_NULL);
       if (UNTAG_Bool(REGB1)) {
       } else {
-        nit_abort("Uninitialized attribute %s", "_key", LOCATE_standard___collection___hash_collection, 175);
+        nit_abort("Uninitialized attribute %s", "_key", LOCATE_standard___collection___hash_collection, 178);
       }
       fra.me.REG[3] = ATTR_standard___collection___hash_collection___HashNode____key(fra.me.REG[2]);
       REGB1 = CALL_standard___collection___hash_collection___HashCollection___index_at(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[3]);
-      /* ./../lib/standard//collection//array.nit:652 */
+      /* ../lib/standard/collection/array.nit:718 */
       fra.me.REG[3] = ((Nit_NativeArray)fra.me.REG[1])->val[UNTAG_Int(REGB1)];
-      /* ./../lib/standard//collection//array.nit:653 */
+      /* ../lib/standard/collection/array.nit:719 */
       ((Nit_NativeArray)fra.me.REG[1])->val[UNTAG_Int(REGB1)]=fra.me.REG[2];
-      /* ./../lib/standard//collection//hash_collection.nit:179 */
+      /* ../lib/standard/collection/hash_collection.nit:182 */
       ATTR_standard___collection___hash_collection___HashNode____next_in_bucklet(fra.me.REG[2]) = fra.me.REG[3];
-      /* ./../lib/standard//collection//hash_collection.nit:180 */
+      /* ../lib/standard/collection/hash_collection.nit:183 */
       REGB1 = TAG_Bool(fra.me.REG[3]==NIT_NULL);
       if (UNTAG_Bool(REGB1)) {
       } else {
@@ -730,11 +738,11 @@ void standard___collection___hash_collection___HashCollection___enlarge(val_t p0
       if (UNTAG_Bool(REGB1)) {
         ATTR_standard___collection___hash_collection___HashNode____prev_in_bucklet(fra.me.REG[3]) = fra.me.REG[2];
       }
-      /* ./../lib/standard//collection//hash_collection.nit:181 */
+      /* ../lib/standard/collection/hash_collection.nit:184 */
       fra.me.REG[3] = ATTR_standard___collection___hash_collection___HashNode____next_item(fra.me.REG[2]);
       fra.me.REG[2] = fra.me.REG[3];
     } else {
-      /* ./../lib/standard//collection//hash_collection.nit:174 */
+      /* ../lib/standard/collection/hash_collection.nit:177 */
       goto label3;
     }
   }
@@ -754,6 +762,7 @@ void standard___collection___hash_collection___HashCollection___init(val_t p0, i
   fra.me.meth = LOCATE_standard___collection___hash_collection___HashCollection___init;
   fra.me.has_broke = 0;
   fra.me.REG_size = 0;
+  fra.me.nitni_local_ref_head = NULL;
   stack_frame_head = fra.me.prev;
   init_table[itpos0] = 1;
   return;
@@ -763,13 +772,14 @@ val_t standard___collection___hash_collection___HashNode___next_item(val_t p0){
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 189;
+  fra.me.line = 192;
   fra.me.meth = LOCATE_standard___collection___hash_collection___HashNode___next_item;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[0] = p0;
-  /* ./../lib/standard//collection//hash_collection.nit:189 */
+  /* ../lib/standard/collection/hash_collection.nit:192 */
   fra.me.REG[0] = ATTR_standard___collection___hash_collection___HashNode____next_item(fra.me.REG[0]);
   stack_frame_head = fra.me.prev;
   return fra.me.REG[0];
@@ -779,15 +789,16 @@ void standard___collection___hash_collection___HashNode___next_item__eq(val_t p0
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 189;
+  fra.me.line = 192;
   fra.me.meth = LOCATE_standard___collection___hash_collection___HashNode___next_item__eq;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[1] = NIT_NULL;
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
-  /* ./../lib/standard//collection//hash_collection.nit:189 */
+  /* ../lib/standard/collection/hash_collection.nit:192 */
   ATTR_standard___collection___hash_collection___HashNode____next_item(fra.me.REG[0]) = fra.me.REG[1];
   stack_frame_head = fra.me.prev;
   return;
@@ -797,13 +808,14 @@ val_t standard___collection___hash_collection___HashNode___prev_item(val_t p0){
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 190;
+  fra.me.line = 193;
   fra.me.meth = LOCATE_standard___collection___hash_collection___HashNode___prev_item;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[0] = p0;
-  /* ./../lib/standard//collection//hash_collection.nit:190 */
+  /* ../lib/standard/collection/hash_collection.nit:193 */
   fra.me.REG[0] = ATTR_standard___collection___hash_collection___HashNode____prev_item(fra.me.REG[0]);
   stack_frame_head = fra.me.prev;
   return fra.me.REG[0];
@@ -813,15 +825,16 @@ void standard___collection___hash_collection___HashNode___prev_item__eq(val_t p0
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 190;
+  fra.me.line = 193;
   fra.me.meth = LOCATE_standard___collection___hash_collection___HashNode___prev_item__eq;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[1] = NIT_NULL;
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
-  /* ./../lib/standard//collection//hash_collection.nit:190 */
+  /* ../lib/standard/collection/hash_collection.nit:193 */
   ATTR_standard___collection___hash_collection___HashNode____prev_item(fra.me.REG[0]) = fra.me.REG[1];
   stack_frame_head = fra.me.prev;
   return;
@@ -833,15 +846,16 @@ void standard___collection___hash_collection___HashNode___init(val_t p0, val_t p
   if (init_table[itpos1]) return;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 193;
+  fra.me.line = 196;
   fra.me.meth = LOCATE_standard___collection___hash_collection___HashNode___init;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[1] = NIT_NULL;
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
-  /* ./../lib/standard//collection//hash_collection.nit:195 */
+  /* ../lib/standard/collection/hash_collection.nit:198 */
   ATTR_standard___collection___hash_collection___HashNode____key(fra.me.REG[0]) = fra.me.REG[1];
   stack_frame_head = fra.me.prev;
   init_table[itpos1] = 1;
@@ -854,17 +868,18 @@ val_t standard___collection___hash_collection___HashMap_____bra(val_t p0, val_t
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 203;
+  fra.me.line = 208;
   fra.me.meth = LOCATE_standard___collection___hash_collection___HashMap_____bra;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[1] = NIT_NULL;
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
-  /* ./../lib/standard//collection//hash_collection.nit:205 */
+  /* ../lib/standard/collection/hash_collection.nit:210 */
   fra.me.REG[1] = CALL_standard___collection___hash_collection___HashCollection___node_at(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1]);
-  /* ./../lib/standard//collection//hash_collection.nit:206 */
+  /* ../lib/standard/collection/hash_collection.nit:211 */
   REGB0 = TAG_Bool(fra.me.REG[1]==NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
@@ -878,10 +893,10 @@ val_t standard___collection___hash_collection___HashMap_____bra(val_t p0, val_t
     }
   }
   if (UNTAG_Bool(REGB0)) {
-    /* ./../lib/standard//collection//hash_collection.nit:207 */
-    nit_abort("Aborted", NULL, LOCATE_standard___collection___hash_collection, 207);
+    /* ../lib/standard/collection/hash_collection.nit:212 */
+    nit_abort("Aborted", NULL, LOCATE_standard___collection___hash_collection, 212);
   } else {
-    /* ./../lib/standard//collection//hash_collection.nit:209 */
+    /* ../lib/standard/collection/hash_collection.nit:214 */
     fra.me.REG[1] = ATTR_standard___collection___hash_collection___HashMapNode____value(fra.me.REG[1]);
     goto label1;
   }
@@ -889,53 +904,19 @@ val_t standard___collection___hash_collection___HashMap_____bra(val_t p0, val_t
   stack_frame_head = fra.me.prev;
   return fra.me.REG[1];
 }
-val_t standard___collection___hash_collection___HashMap___has_key(val_t p0, val_t p1){
-  struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
-  val_t REGB0;
-  val_t REGB1;
-  val_t tmp;
-  fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 213;
-  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMap___has_key;
-  fra.me.has_broke = 0;
-  fra.me.REG_size = 2;
-  fra.me.REG[0] = NIT_NULL;
-  fra.me.REG[1] = NIT_NULL;
-  fra.me.REG[0] = p0;
-  fra.me.REG[1] = p1;
-  /* ./../lib/standard//collection//hash_collection.nit:213 */
-  fra.me.REG[1] = CALL_standard___collection___hash_collection___HashCollection___node_at(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1]);
-  REGB0 = TAG_Bool(fra.me.REG[1]==NIT_NULL);
-  if (UNTAG_Bool(REGB0)) {
-  } else {
-    REGB1 = TAG_Bool(fra.me.REG[1]==NIT_NULL);
-    if (UNTAG_Bool(REGB1)) {
-      REGB1 = TAG_Bool(false);
-      REGB0 = REGB1;
-    } else {
-      REGB1 = CALL_standard___kernel___Object_____eqeq(fra.me.REG[1])(fra.me.REG[1], NIT_NULL);
-      REGB0 = REGB1;
-    }
-  }
-  REGB0 = TAG_Bool(!UNTAG_Bool(REGB0));
-  goto label1;
-  label1: while(0);
-  stack_frame_head = fra.me.prev;
-  return REGB0;
-}
 val_t standard___collection___hash_collection___HashMap___iterator(val_t p0){
   struct {struct stack_frame_t me;} fra;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 215;
+  fra.me.line = 218;
   fra.me.meth = LOCATE_standard___collection___hash_collection___HashMap___iterator;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[0] = p0;
-  /* ./../lib/standard//collection//hash_collection.nit:215 */
+  /* ../lib/standard/collection/hash_collection.nit:218 */
   fra.me.REG[0] = NEW_HashMapIterator_standard___collection___hash_collection___HashMapIterator___init(fra.me.REG[0]);
   goto label1;
   label1: while(0);
@@ -943,26 +924,28 @@ val_t standard___collection___hash_collection___HashMap___iterator(val_t p0){
   return fra.me.REG[0];
 }
 void standard___collection___hash_collection___HashMap___iterate(val_t p0, struct stack_frame_t *closctx_param, fun_t clos_fun0){
-  struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
+  struct {struct stack_frame_t me; val_t MORE_REG[2];} fra;
   val_t REGB0;
   val_t REGB1;
   fun_t CREG[1];
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 217;
+  fra.me.line = 220;
   fra.me.meth = LOCATE_standard___collection___hash_collection___HashMap___iterate;
   fra.me.has_broke = 0;
-  fra.me.REG_size = 2;
+  fra.me.REG_size = 3;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[1] = NIT_NULL;
+  fra.me.REG[2] = NIT_NULL;
   fra.me.closure_ctx = closctx_param;
   fra.me.closure_funs = CREG;
   fra.me.REG[0] = p0;
   CREG[0] = clos_fun0;
-  /* ./../lib/standard//collection//hash_collection.nit:220 */
+  /* ../lib/standard/collection/hash_collection.nit:223 */
   fra.me.REG[0] = ATTR_standard___collection___hash_collection___HashCollection____first_item(fra.me.REG[0]);
-  /* ./../lib/standard//collection//hash_collection.nit:221 */
+  /* ../lib/standard/collection/hash_collection.nit:224 */
   while(1) {
     REGB0 = TAG_Bool(fra.me.REG[0]==NIT_NULL);
     if (UNTAG_Bool(REGB0)) {
@@ -978,17 +961,23 @@ void standard___collection___hash_collection___HashMap___iterate(val_t p0, struc
     }
     REGB0 = TAG_Bool(!UNTAG_Bool(REGB0));
     if (UNTAG_Bool(REGB0)) {
-      /* ./../lib/standard//collection//hash_collection.nit:222 */
-      fra.me.REG[1] = ATTR_standard___collection___hash_collection___HashMapNode____value(fra.me.REG[0]);
-      ((void (*)(struct stack_frame_t *, val_t))(CREG[0]))(closctx_param, fra.me.REG[1]);
+      /* ../lib/standard/collection/hash_collection.nit:225 */
+      REGB0 = TAG_Bool(ATTR_standard___collection___hash_collection___HashNode____key(fra.me.REG[0])!=NIT_NULL);
+      if (UNTAG_Bool(REGB0)) {
+      } else {
+        nit_abort("Uninitialized attribute %s", "_key", LOCATE_standard___collection___hash_collection, 225);
+      }
+      fra.me.REG[1] = ATTR_standard___collection___hash_collection___HashNode____key(fra.me.REG[0]);
+      fra.me.REG[2] = ATTR_standard___collection___hash_collection___HashMapNode____value(fra.me.REG[0]);
+      ((void (*)(struct stack_frame_t *, val_t, val_t))(CREG[0]))(closctx_param, fra.me.REG[1], fra.me.REG[2]);
       if (closctx_param->has_broke) {
         goto label1;
       }
-      /* ./../lib/standard//collection//hash_collection.nit:223 */
-      fra.me.REG[1] = ATTR_standard___collection___hash_collection___HashNode____next_item(fra.me.REG[0]);
-      fra.me.REG[0] = fra.me.REG[1];
+      /* ../lib/standard/collection/hash_collection.nit:226 */
+      fra.me.REG[2] = ATTR_standard___collection___hash_collection___HashNode____next_item(fra.me.REG[0]);
+      fra.me.REG[0] = fra.me.REG[2];
     } else {
-      /* ./../lib/standard//collection//hash_collection.nit:221 */
+      /* ../lib/standard/collection/hash_collection.nit:224 */
       goto label2;
     }
   }
@@ -997,7 +986,32 @@ void standard___collection___hash_collection___HashMap___iterate(val_t p0, struc
   stack_frame_head = fra.me.prev;
   return;
 }
-val_t standard___collection___hash_collection___HashMap___first(val_t p0){
+val_t standard___collection___hash_collection___HashMap___length(val_t p0){
+  struct {struct stack_frame_t me;} fra;
+  val_t REGB0;
+  val_t tmp;
+  fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
+  fra.me.file = LOCATE_standard___collection___hash_collection;
+  fra.me.line = 230;
+  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMap___length;
+  fra.me.has_broke = 0;
+  fra.me.REG_size = 1;
+  fra.me.nitni_local_ref_head = NULL;
+  fra.me.REG[0] = NIT_NULL;
+  fra.me.REG[0] = p0;
+  /* ../lib/standard/collection/hash_collection.nit:230 */
+  REGB0 = TAG_Bool(ATTR_standard___collection___hash_collection___HashCollection____length(fra.me.REG[0])!=NIT_NULL);
+  if (UNTAG_Bool(REGB0)) {
+  } else {
+    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___hash_collection, 230);
+  }
+  REGB0 = ATTR_standard___collection___hash_collection___HashCollection____length(fra.me.REG[0]);
+  goto label1;
+  label1: while(0);
+  stack_frame_head = fra.me.prev;
+  return REGB0;
+}
+val_t standard___collection___hash_collection___HashMap___is_empty(val_t p0){
   struct {struct stack_frame_t me;} fra;
   val_t REGB0;
   val_t REGB1;
@@ -1005,104 +1019,588 @@ val_t standard___collection___hash_collection___HashMap___first(val_t p0){
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 227;
-  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMap___first;
+  fra.me.line = 232;
+  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMap___is_empty;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[0] = p0;
-  /* ./../lib/standard//collection//hash_collection.nit:229 */
+  /* ../lib/standard/collection/hash_collection.nit:232 */
   REGB0 = TAG_Bool(ATTR_standard___collection___hash_collection___HashCollection____length(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___hash_collection, 229);
+    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___hash_collection, 232);
   }
   REGB0 = ATTR_standard___collection___hash_collection___HashCollection____length(fra.me.REG[0]);
   REGB1 = TAG_Int(0);
-  REGB2 = TAG_Bool(VAL_ISA(REGB1, VTCOLOR_standard___kernel___Comparable___OTHER(REGB0), VTID_standard___kernel___Comparable___OTHER(REGB0))) /*cast OTHER*/;
+  REGB2 = TAG_Bool(IS_EQUAL_OO(REGB0,REGB1));
   if (UNTAG_Bool(REGB2)) {
   } else {
-    nit_abort("Cast failed", NULL, LOCATE_standard___kernel, 0);
+    /* ../lib/standard/kernel.nit:227 */
+    REGB1 = TAG_Bool((REGB0)==(REGB1));
+    /* ../lib/standard/collection/hash_collection.nit:232 */
+    REGB2 = REGB1;
   }
-  /* ./../lib/standard//kernel.nit:217 */
-  REGB1 = TAG_Bool(UNTAG_Int(REGB0)>UNTAG_Int(REGB1));
-  /* ./../lib/standard//collection//hash_collection.nit:229 */
+  goto label1;
+  label1: while(0);
+  stack_frame_head = fra.me.prev;
+  return REGB2;
+}
+void standard___collection___hash_collection___HashMap_____braeq(val_t p0, val_t p1, val_t p2){
+  struct {struct stack_frame_t me; val_t MORE_REG[3];} fra;
+  val_t REGB0;
+  val_t REGB1;
+  val_t REGB2;
+  val_t tmp;
+  fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
+  fra.me.file = LOCATE_standard___collection___hash_collection;
+  fra.me.line = 234;
+  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMap_____braeq;
+  fra.me.has_broke = 0;
+  fra.me.REG_size = 4;
+  fra.me.nitni_local_ref_head = NULL;
+  fra.me.REG[0] = NIT_NULL;
+  fra.me.REG[1] = NIT_NULL;
+  fra.me.REG[2] = NIT_NULL;
+  fra.me.REG[3] = NIT_NULL;
+  fra.me.REG[0] = p0;
+  fra.me.REG[1] = p1;
+  fra.me.REG[2] = p2;
+  /* ../lib/standard/collection/hash_collection.nit:236 */
+  REGB0 = CALL_standard___collection___hash_collection___HashCollection___index_at(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1]);
+  /* ../lib/standard/collection/hash_collection.nit:237 */
+  fra.me.REG[3] = CALL_standard___collection___hash_collection___HashCollection___node_at_idx(fra.me.REG[0])(fra.me.REG[0], REGB0, fra.me.REG[1]);
+  /* ../lib/standard/collection/hash_collection.nit:238 */
+  REGB1 = TAG_Bool(fra.me.REG[3]==NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
   } else {
-    nit_abort("Assert failed", NULL, LOCATE_standard___collection___hash_collection, 229);
+    REGB2 = TAG_Bool(fra.me.REG[3]==NIT_NULL);
+    if (UNTAG_Bool(REGB2)) {
+      REGB2 = TAG_Bool(false);
+      REGB1 = REGB2;
+    } else {
+      REGB2 = CALL_standard___kernel___Object_____eqeq(fra.me.REG[3])(fra.me.REG[3], NIT_NULL);
+      REGB1 = REGB2;
+    }
   }
-  /* ./../lib/standard//collection//hash_collection.nit:230 */
-  fra.me.REG[0] = ATTR_standard___collection___hash_collection___HashCollection____first_item(fra.me.REG[0]);
-  REGB1 = TAG_Bool(fra.me.REG[0]==NIT_NULL);
+  REGB1 = TAG_Bool(!UNTAG_Bool(REGB1));
   if (UNTAG_Bool(REGB1)) {
-    nit_abort("Reciever is null", NULL, LOCATE_standard___collection___hash_collection, 230);
+    /* ../lib/standard/collection/hash_collection.nit:239 */
+    ATTR_standard___collection___hash_collection___HashNode____key(fra.me.REG[3]) = fra.me.REG[1];
+    /* ../lib/standard/collection/hash_collection.nit:240 */
+    ATTR_standard___collection___hash_collection___HashMapNode____value(fra.me.REG[3]) = fra.me.REG[2];
+  } else {
+    /* ../lib/standard/collection/hash_collection.nit:242 */
+    fra.me.REG[2] = NEW_HashMapNode_standard___collection___hash_collection___HashMapNode___init(fra.me.REG[1], fra.me.REG[2]);
+    CALL_standard___collection___hash_collection___HashCollection___store(fra.me.REG[0])(fra.me.REG[0], REGB0, fra.me.REG[2]);
+  }
+  stack_frame_head = fra.me.prev;
+  return;
+}
+void standard___collection___hash_collection___HashMap___clear(val_t p0){
+  struct {struct stack_frame_t me;} fra;
+  val_t tmp;
+  fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
+  fra.me.file = LOCATE_standard___collection___hash_collection;
+  fra.me.line = 246;
+  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMap___clear;
+  fra.me.has_broke = 0;
+  fra.me.REG_size = 1;
+  fra.me.nitni_local_ref_head = NULL;
+  fra.me.REG[0] = NIT_NULL;
+  fra.me.REG[0] = p0;
+  /* ../lib/standard/collection/hash_collection.nit:246 */
+  CALL_standard___collection___hash_collection___HashCollection___raz(fra.me.REG[0])(fra.me.REG[0]);
+  stack_frame_head = fra.me.prev;
+  return;
+}
+void standard___collection___hash_collection___HashMap___init(val_t p0, int* init_table){
+  int itpos2 = VAL2OBJ(p0)->vft[INIT_TABLE_POS_standard___collection___hash_collection___HashMap].i;
+  struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
+  val_t REGB0;
+  val_t tmp;
+  if (init_table[itpos2]) return;
+  fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
+  fra.me.file = LOCATE_standard___collection___hash_collection;
+  fra.me.line = 248;
+  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMap___init;
+  fra.me.has_broke = 0;
+  fra.me.REG_size = 2;
+  fra.me.nitni_local_ref_head = NULL;
+  fra.me.REG[0] = NIT_NULL;
+  fra.me.REG[1] = NIT_NULL;
+  fra.me.REG[0] = p0;
+  /* ../lib/standard/collection/hash_collection.nit:248 */
+  fra.me.REG[1] = fra.me.REG[0];
+  CALL_standard___collection___hash_collection___HashCollection___init(fra.me.REG[0])(fra.me.REG[0], init_table);
+  /* ../lib/standard/collection/hash_collection.nit:250 */
+  REGB0 = TAG_Int(0);
+  ATTR_standard___collection___hash_collection___HashCollection____capacity(fra.me.REG[1]) = REGB0;
+  /* ../lib/standard/collection/hash_collection.nit:251 */
+  REGB0 = TAG_Int(0);
+  ATTR_standard___collection___hash_collection___HashCollection____length(fra.me.REG[1]) = REGB0;
+  /* ../lib/standard/collection/hash_collection.nit:252 */
+  REGB0 = TAG_Int(0);
+  CALL_standard___collection___hash_collection___HashCollection___enlarge(fra.me.REG[1])(fra.me.REG[1], REGB0);
+  stack_frame_head = fra.me.prev;
+  init_table[itpos2] = 1;
+  return;
+}
+val_t standard___collection___hash_collection___HashMap___keys(val_t p0){
+  struct {struct stack_frame_t me;} fra;
+  val_t REGB0;
+  val_t tmp;
+  fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
+  fra.me.file = LOCATE_standard___collection___hash_collection;
+  fra.me.line = 255;
+  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMap___keys;
+  fra.me.has_broke = 0;
+  fra.me.REG_size = 1;
+  fra.me.nitni_local_ref_head = NULL;
+  fra.me.REG[0] = NIT_NULL;
+  fra.me.REG[0] = p0;
+  /* ../lib/standard/collection/hash_collection.nit:255 */
+  REGB0 = TAG_Bool(ATTR_standard___collection___hash_collection___HashMap_____atkeys(fra.me.REG[0])!=NIT_NULL);
+  if (UNTAG_Bool(REGB0)) {
+  } else {
+    nit_abort("Uninitialized attribute %s", "@keys", LOCATE_standard___collection___hash_collection, 255);
+  }
+  fra.me.REG[0] = ATTR_standard___collection___hash_collection___HashMap_____atkeys(fra.me.REG[0]);
+  stack_frame_head = fra.me.prev;
+  return fra.me.REG[0];
+}
+void standard___collection___hash_collection___HashMap___keys__eq(val_t p0, val_t p1){
+  struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
+  val_t tmp;
+  fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
+  fra.me.file = LOCATE_standard___collection___hash_collection;
+  fra.me.line = 255;
+  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMap___keys__eq;
+  fra.me.has_broke = 0;
+  fra.me.REG_size = 2;
+  fra.me.nitni_local_ref_head = NULL;
+  fra.me.REG[0] = NIT_NULL;
+  fra.me.REG[1] = NIT_NULL;
+  fra.me.REG[0] = p0;
+  fra.me.REG[1] = p1;
+  /* ../lib/standard/collection/hash_collection.nit:255 */
+  ATTR_standard___collection___hash_collection___HashMap_____atkeys(fra.me.REG[0]) = fra.me.REG[1];
+  stack_frame_head = fra.me.prev;
+  return;
+}
+val_t standard___collection___hash_collection___HashMap___values(val_t p0){
+  struct {struct stack_frame_t me;} fra;
+  val_t REGB0;
+  val_t tmp;
+  fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
+  fra.me.file = LOCATE_standard___collection___hash_collection;
+  fra.me.line = 256;
+  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMap___values;
+  fra.me.has_broke = 0;
+  fra.me.REG_size = 1;
+  fra.me.nitni_local_ref_head = NULL;
+  fra.me.REG[0] = NIT_NULL;
+  fra.me.REG[0] = p0;
+  /* ../lib/standard/collection/hash_collection.nit:256 */
+  REGB0 = TAG_Bool(ATTR_standard___collection___hash_collection___HashMap_____atvalues(fra.me.REG[0])!=NIT_NULL);
+  if (UNTAG_Bool(REGB0)) {
+  } else {
+    nit_abort("Uninitialized attribute %s", "@values", LOCATE_standard___collection___hash_collection, 256);
+  }
+  fra.me.REG[0] = ATTR_standard___collection___hash_collection___HashMap_____atvalues(fra.me.REG[0]);
+  stack_frame_head = fra.me.prev;
+  return fra.me.REG[0];
+}
+void standard___collection___hash_collection___HashMap___values__eq(val_t p0, val_t p1){
+  struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
+  val_t tmp;
+  fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
+  fra.me.file = LOCATE_standard___collection___hash_collection;
+  fra.me.line = 256;
+  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMap___values__eq;
+  fra.me.has_broke = 0;
+  fra.me.REG_size = 2;
+  fra.me.nitni_local_ref_head = NULL;
+  fra.me.REG[0] = NIT_NULL;
+  fra.me.REG[1] = NIT_NULL;
+  fra.me.REG[0] = p0;
+  fra.me.REG[1] = p1;
+  /* ../lib/standard/collection/hash_collection.nit:256 */
+  ATTR_standard___collection___hash_collection___HashMap_____atvalues(fra.me.REG[0]) = fra.me.REG[1];
+  stack_frame_head = fra.me.prev;
+  return;
+}
+val_t standard___collection___hash_collection___HashMapKeys___map(val_t p0){
+  struct {struct stack_frame_t me;} fra;
+  val_t REGB0;
+  val_t tmp;
+  fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
+  fra.me.file = LOCATE_standard___collection___hash_collection;
+  fra.me.line = 262;
+  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMapKeys___map;
+  fra.me.has_broke = 0;
+  fra.me.REG_size = 1;
+  fra.me.nitni_local_ref_head = NULL;
+  fra.me.REG[0] = NIT_NULL;
+  fra.me.REG[0] = p0;
+  /* ../lib/standard/collection/hash_collection.nit:262 */
+  REGB0 = TAG_Bool(ATTR_standard___collection___hash_collection___HashMapKeys_____atmap(fra.me.REG[0])!=NIT_NULL);
+  if (UNTAG_Bool(REGB0)) {
+  } else {
+    nit_abort("Uninitialized attribute %s", "@map", LOCATE_standard___collection___hash_collection, 262);
+  }
+  fra.me.REG[0] = ATTR_standard___collection___hash_collection___HashMapKeys_____atmap(fra.me.REG[0]);
+  stack_frame_head = fra.me.prev;
+  return fra.me.REG[0];
+}
+void standard___collection___hash_collection___HashMapKeys___map__eq(val_t p0, val_t p1){
+  struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
+  val_t tmp;
+  fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
+  fra.me.file = LOCATE_standard___collection___hash_collection;
+  fra.me.line = 262;
+  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMapKeys___map__eq;
+  fra.me.has_broke = 0;
+  fra.me.REG_size = 2;
+  fra.me.nitni_local_ref_head = NULL;
+  fra.me.REG[0] = NIT_NULL;
+  fra.me.REG[1] = NIT_NULL;
+  fra.me.REG[0] = p0;
+  fra.me.REG[1] = p1;
+  /* ../lib/standard/collection/hash_collection.nit:262 */
+  ATTR_standard___collection___hash_collection___HashMapKeys_____atmap(fra.me.REG[0]) = fra.me.REG[1];
+  stack_frame_head = fra.me.prev;
+  return;
+}
+val_t standard___collection___hash_collection___HashMapKeys___count(val_t p0, val_t p1){
+  struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
+  val_t REGB0;
+  val_t REGB1;
+  val_t tmp;
+  fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
+  fra.me.file = LOCATE_standard___collection___hash_collection;
+  fra.me.line = 265;
+  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMapKeys___count;
+  fra.me.has_broke = 0;
+  fra.me.REG_size = 2;
+  fra.me.nitni_local_ref_head = NULL;
+  fra.me.REG[0] = NIT_NULL;
+  fra.me.REG[1] = NIT_NULL;
+  fra.me.REG[0] = p0;
+  fra.me.REG[1] = p1;
+  /* ../lib/standard/collection/hash_collection.nit:265 */
+  REGB0 = CALL_standard___collection___abstract_collection___Collection___has(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1]);
+  if (UNTAG_Bool(REGB0)) {
+    REGB0 = TAG_Int(1);
+    goto label1;
+  } else {
+    REGB1 = TAG_Int(0);
+    REGB0 = REGB1;
+    goto label1;
+  }
+  label1: while(0);
+  stack_frame_head = fra.me.prev;
+  return REGB0;
+}
+val_t standard___collection___hash_collection___HashMapKeys___first(val_t p0){
+  struct {struct stack_frame_t me;} fra;
+  val_t REGB0;
+  val_t tmp;
+  fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
+  fra.me.file = LOCATE_standard___collection___hash_collection;
+  fra.me.line = 266;
+  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMapKeys___first;
+  fra.me.has_broke = 0;
+  fra.me.REG_size = 1;
+  fra.me.nitni_local_ref_head = NULL;
+  fra.me.REG[0] = NIT_NULL;
+  fra.me.REG[0] = p0;
+  /* ../lib/standard/collection/hash_collection.nit:266 */
+  fra.me.REG[0] = CALL_standard___collection___hash_collection___HashMapKeys___map(fra.me.REG[0])(fra.me.REG[0]);
+  fra.me.REG[0] = ATTR_standard___collection___hash_collection___HashCollection____first_item(fra.me.REG[0]);
+  REGB0 = TAG_Bool(fra.me.REG[0]==NIT_NULL);
+  if (UNTAG_Bool(REGB0)) {
+    nit_abort("Reciever is null", NULL, LOCATE_standard___collection___hash_collection, 266);
+  }
+  REGB0 = TAG_Bool(ATTR_standard___collection___hash_collection___HashNode____key(fra.me.REG[0])!=NIT_NULL);
+  if (UNTAG_Bool(REGB0)) {
+  } else {
+    nit_abort("Uninitialized attribute %s", "_key", LOCATE_standard___collection___hash_collection, 266);
+  }
+  fra.me.REG[0] = ATTR_standard___collection___hash_collection___HashNode____key(fra.me.REG[0]);
+  goto label1;
+  label1: while(0);
+  stack_frame_head = fra.me.prev;
+  return fra.me.REG[0];
+}
+val_t standard___collection___hash_collection___HashMapKeys___has(val_t p0, val_t p1){
+  struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
+  val_t REGB0;
+  val_t REGB1;
+  val_t tmp;
+  fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
+  fra.me.file = LOCATE_standard___collection___hash_collection;
+  fra.me.line = 267;
+  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMapKeys___has;
+  fra.me.has_broke = 0;
+  fra.me.REG_size = 2;
+  fra.me.nitni_local_ref_head = NULL;
+  fra.me.REG[0] = NIT_NULL;
+  fra.me.REG[1] = NIT_NULL;
+  fra.me.REG[0] = p0;
+  fra.me.REG[1] = p1;
+  /* ../lib/standard/collection/hash_collection.nit:267 */
+  fra.me.REG[0] = CALL_standard___collection___hash_collection___HashMapKeys___map(fra.me.REG[0])(fra.me.REG[0]);
+  fra.me.REG[1] = CALL_standard___collection___hash_collection___HashCollection___node_at(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1]);
+  REGB0 = TAG_Bool(fra.me.REG[1]==NIT_NULL);
+  if (UNTAG_Bool(REGB0)) {
+  } else {
+    REGB1 = TAG_Bool(fra.me.REG[1]==NIT_NULL);
+    if (UNTAG_Bool(REGB1)) {
+      REGB1 = TAG_Bool(false);
+      REGB0 = REGB1;
+    } else {
+      REGB1 = CALL_standard___kernel___Object_____eqeq(fra.me.REG[1])(fra.me.REG[1], NIT_NULL);
+      REGB0 = REGB1;
+    }
+  }
+  REGB0 = TAG_Bool(!UNTAG_Bool(REGB0));
+  goto label1;
+  label1: while(0);
+  stack_frame_head = fra.me.prev;
+  return REGB0;
+}
+val_t standard___collection___hash_collection___HashMapKeys___has_only(val_t p0, val_t p1){
+  struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
+  val_t REGB0;
+  val_t REGB1;
+  val_t REGB2;
+  val_t tmp;
+  fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
+  fra.me.file = LOCATE_standard___collection___hash_collection;
+  fra.me.line = 268;
+  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMapKeys___has_only;
+  fra.me.has_broke = 0;
+  fra.me.REG_size = 2;
+  fra.me.nitni_local_ref_head = NULL;
+  fra.me.REG[0] = NIT_NULL;
+  fra.me.REG[1] = NIT_NULL;
+  fra.me.REG[0] = p0;
+  fra.me.REG[1] = p1;
+  /* ../lib/standard/collection/hash_collection.nit:268 */
+  REGB0 = CALL_standard___collection___abstract_collection___Collection___has(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1]);
+  if (UNTAG_Bool(REGB0)) {
+    REGB0 = CALL_standard___collection___abstract_collection___Collection___length(fra.me.REG[0])(fra.me.REG[0]);
+    REGB1 = TAG_Int(1);
+    REGB2 = TAG_Bool(IS_EQUAL_OO(REGB0,REGB1));
+    if (UNTAG_Bool(REGB2)) {
+    } else {
+      /* ../lib/standard/kernel.nit:227 */
+      REGB1 = TAG_Bool((REGB0)==(REGB1));
+      /* ../lib/standard/collection/hash_collection.nit:268 */
+      REGB2 = REGB1;
+    }
+  } else {
+    REGB1 = TAG_Bool(false);
+    REGB2 = REGB1;
+  }
+  if (UNTAG_Bool(REGB2)) {
+    REGB2 = TAG_Bool(true);
+  } else {
+    REGB1 = CALL_standard___collection___abstract_collection___Collection___is_empty(fra.me.REG[0])(fra.me.REG[0]);
+    REGB2 = REGB1;
   }
-  fra.me.REG[0] = ATTR_standard___collection___hash_collection___HashMapNode____value(fra.me.REG[0]);
   goto label1;
   label1: while(0);
   stack_frame_head = fra.me.prev;
-  return fra.me.REG[0];
+  return REGB2;
+}
+val_t standard___collection___hash_collection___HashMapKeys___is_empty(val_t p0){
+  struct {struct stack_frame_t me;} fra;
+  val_t REGB0;
+  val_t tmp;
+  fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
+  fra.me.file = LOCATE_standard___collection___hash_collection;
+  fra.me.line = 269;
+  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMapKeys___is_empty;
+  fra.me.has_broke = 0;
+  fra.me.REG_size = 1;
+  fra.me.nitni_local_ref_head = NULL;
+  fra.me.REG[0] = NIT_NULL;
+  fra.me.REG[0] = p0;
+  /* ../lib/standard/collection/hash_collection.nit:269 */
+  fra.me.REG[0] = CALL_standard___collection___hash_collection___HashMapKeys___map(fra.me.REG[0])(fra.me.REG[0]);
+  REGB0 = CALL_standard___collection___abstract_collection___MapRead___is_empty(fra.me.REG[0])(fra.me.REG[0]);
+  goto label1;
+  label1: while(0);
+  stack_frame_head = fra.me.prev;
+  return REGB0;
+}
+val_t standard___collection___hash_collection___HashMapKeys___length(val_t p0){
+  struct {struct stack_frame_t me;} fra;
+  val_t REGB0;
+  val_t tmp;
+  fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
+  fra.me.file = LOCATE_standard___collection___hash_collection;
+  fra.me.line = 270;
+  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMapKeys___length;
+  fra.me.has_broke = 0;
+  fra.me.REG_size = 1;
+  fra.me.nitni_local_ref_head = NULL;
+  fra.me.REG[0] = NIT_NULL;
+  fra.me.REG[0] = p0;
+  /* ../lib/standard/collection/hash_collection.nit:270 */
+  fra.me.REG[0] = CALL_standard___collection___hash_collection___HashMapKeys___map(fra.me.REG[0])(fra.me.REG[0]);
+  REGB0 = CALL_standard___collection___abstract_collection___MapRead___length(fra.me.REG[0])(fra.me.REG[0]);
+  goto label1;
+  label1: while(0);
+  stack_frame_head = fra.me.prev;
+  return REGB0;
+}
+val_t standard___collection___hash_collection___HashMapKeys___iterator(val_t p0){
+  struct {struct stack_frame_t me;} fra;
+  val_t tmp;
+  fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
+  fra.me.file = LOCATE_standard___collection___hash_collection;
+  fra.me.line = 272;
+  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMapKeys___iterator;
+  fra.me.has_broke = 0;
+  fra.me.REG_size = 1;
+  fra.me.nitni_local_ref_head = NULL;
+  fra.me.REG[0] = NIT_NULL;
+  fra.me.REG[0] = p0;
+  /* ../lib/standard/collection/hash_collection.nit:272 */
+  fra.me.REG[0] = CALL_standard___collection___hash_collection___HashMapKeys___map(fra.me.REG[0])(fra.me.REG[0]);
+  fra.me.REG[0] = CALL_standard___collection___abstract_collection___MapRead___iterator(fra.me.REG[0])(fra.me.REG[0]);
+  fra.me.REG[0] = NEW_MapKeysIterator_standard___collection___abstract_collection___MapKeysIterator___init(fra.me.REG[0]);
+  goto label1;
+  label1: while(0);
+  stack_frame_head = fra.me.prev;
+  return fra.me.REG[0];
+}
+void standard___collection___hash_collection___HashMapKeys___clear(val_t p0){
+  struct {struct stack_frame_t me;} fra;
+  val_t tmp;
+  fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
+  fra.me.file = LOCATE_standard___collection___hash_collection;
+  fra.me.line = 274;
+  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMapKeys___clear;
+  fra.me.has_broke = 0;
+  fra.me.REG_size = 1;
+  fra.me.nitni_local_ref_head = NULL;
+  fra.me.REG[0] = NIT_NULL;
+  fra.me.REG[0] = p0;
+  /* ../lib/standard/collection/hash_collection.nit:274 */
+  fra.me.REG[0] = CALL_standard___collection___hash_collection___HashMapKeys___map(fra.me.REG[0])(fra.me.REG[0]);
+  CALL_standard___collection___abstract_collection___Map___clear(fra.me.REG[0])(fra.me.REG[0]);
+  stack_frame_head = fra.me.prev;
+  return;
+}
+void standard___collection___hash_collection___HashMapKeys___remove(val_t p0, val_t p1){
+  struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
+  val_t tmp;
+  fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
+  fra.me.file = LOCATE_standard___collection___hash_collection;
+  fra.me.line = 276;
+  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMapKeys___remove;
+  fra.me.has_broke = 0;
+  fra.me.REG_size = 2;
+  fra.me.nitni_local_ref_head = NULL;
+  fra.me.REG[0] = NIT_NULL;
+  fra.me.REG[1] = NIT_NULL;
+  fra.me.REG[0] = p0;
+  fra.me.REG[1] = p1;
+  /* ../lib/standard/collection/hash_collection.nit:276 */
+  fra.me.REG[0] = CALL_standard___collection___hash_collection___HashMapKeys___map(fra.me.REG[0])(fra.me.REG[0]);
+  CALL_standard___collection___hash_collection___HashCollection___remove_node(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1]);
+  stack_frame_head = fra.me.prev;
+  return;
+}
+void standard___collection___hash_collection___HashMapKeys___remove_all(val_t p0, val_t p1){
+  struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
+  val_t tmp;
+  fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
+  fra.me.file = LOCATE_standard___collection___hash_collection;
+  fra.me.line = 277;
+  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMapKeys___remove_all;
+  fra.me.has_broke = 0;
+  fra.me.REG_size = 2;
+  fra.me.nitni_local_ref_head = NULL;
+  fra.me.REG[0] = NIT_NULL;
+  fra.me.REG[1] = NIT_NULL;
+  fra.me.REG[0] = p0;
+  fra.me.REG[1] = p1;
+  /* ../lib/standard/collection/hash_collection.nit:277 */
+  fra.me.REG[0] = CALL_standard___collection___hash_collection___HashMapKeys___map(fra.me.REG[0])(fra.me.REG[0]);
+  CALL_standard___collection___hash_collection___HashCollection___remove_node(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1]);
+  stack_frame_head = fra.me.prev;
+  return;
+}
+void standard___collection___hash_collection___HashMapKeys___init(val_t p0, val_t p1, int* init_table){
+  int itpos3 = VAL2OBJ(p0)->vft[INIT_TABLE_POS_standard___collection___hash_collection___HashMapKeys].i;
+  struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
+  val_t tmp;
+  if (init_table[itpos3]) return;
+  fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
+  fra.me.file = LOCATE_standard___collection___hash_collection;
+  fra.me.line = 0;
+  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMapKeys___init;
+  fra.me.has_broke = 0;
+  fra.me.REG_size = 2;
+  fra.me.nitni_local_ref_head = NULL;
+  fra.me.REG[0] = NIT_NULL;
+  fra.me.REG[1] = NIT_NULL;
+  fra.me.REG[0] = p0;
+  fra.me.REG[1] = p1;
+  ATTR_standard___collection___hash_collection___HashMapKeys_____atmap(fra.me.REG[0]) = fra.me.REG[1];
+  stack_frame_head = fra.me.prev;
+  init_table[itpos3] = 1;
+  return;
 }
-val_t standard___collection___hash_collection___HashMap___length(val_t p0){
+val_t standard___collection___hash_collection___HashMapValues___map(val_t p0){
   struct {struct stack_frame_t me;} fra;
   val_t REGB0;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 233;
-  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMap___length;
+  fra.me.line = 283;
+  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMapValues___map;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[0] = p0;
-  /* ./../lib/standard//collection//hash_collection.nit:233 */
-  REGB0 = TAG_Bool(ATTR_standard___collection___hash_collection___HashCollection____length(fra.me.REG[0])!=NIT_NULL);
+  /* ../lib/standard/collection/hash_collection.nit:283 */
+  REGB0 = TAG_Bool(ATTR_standard___collection___hash_collection___HashMapValues_____atmap(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___hash_collection, 233);
+    nit_abort("Uninitialized attribute %s", "@map", LOCATE_standard___collection___hash_collection, 283);
   }
-  REGB0 = ATTR_standard___collection___hash_collection___HashCollection____length(fra.me.REG[0]);
-  goto label1;
-  label1: while(0);
+  fra.me.REG[0] = ATTR_standard___collection___hash_collection___HashMapValues_____atmap(fra.me.REG[0]);
   stack_frame_head = fra.me.prev;
-  return REGB0;
+  return fra.me.REG[0];
 }
-val_t standard___collection___hash_collection___HashMap___is_empty(val_t p0){
-  struct {struct stack_frame_t me;} fra;
-  val_t REGB0;
-  val_t REGB1;
-  val_t REGB2;
+void standard___collection___hash_collection___HashMapValues___map__eq(val_t p0, val_t p1){
+  struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 235;
-  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMap___is_empty;
+  fra.me.line = 283;
+  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMapValues___map__eq;
   fra.me.has_broke = 0;
-  fra.me.REG_size = 1;
+  fra.me.REG_size = 2;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
+  fra.me.REG[1] = NIT_NULL;
   fra.me.REG[0] = p0;
-  /* ./../lib/standard//collection//hash_collection.nit:235 */
-  REGB0 = TAG_Bool(ATTR_standard___collection___hash_collection___HashCollection____length(fra.me.REG[0])!=NIT_NULL);
-  if (UNTAG_Bool(REGB0)) {
-  } else {
-    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___hash_collection, 235);
-  }
-  REGB0 = ATTR_standard___collection___hash_collection___HashCollection____length(fra.me.REG[0]);
-  REGB1 = TAG_Int(0);
-  REGB2 = TAG_Bool(IS_EQUAL_OO(REGB0,REGB1));
-  if (UNTAG_Bool(REGB2)) {
-  } else {
-    /* ./../lib/standard//kernel.nit:210 */
-    REGB1 = TAG_Bool((REGB0)==(REGB1));
-    /* ./../lib/standard//collection//hash_collection.nit:235 */
-    REGB2 = REGB1;
-  }
-  goto label1;
-  label1: while(0);
+  fra.me.REG[1] = p1;
+  /* ../lib/standard/collection/hash_collection.nit:283 */
+  ATTR_standard___collection___hash_collection___HashMapValues_____atmap(fra.me.REG[0]) = fra.me.REG[1];
   stack_frame_head = fra.me.prev;
-  return REGB2;
+  return;
 }
-val_t standard___collection___hash_collection___HashMap___count(val_t p0, val_t p1){
+val_t standard___collection___hash_collection___HashMapValues___count(val_t p0, val_t p1){
   struct {struct stack_frame_t me; val_t MORE_REG[2];} fra;
   val_t REGB0;
   val_t REGB1;
@@ -1110,20 +1608,22 @@ val_t standard___collection___hash_collection___HashMap___count(val_t p0, val_t
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 237;
-  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMap___count;
+  fra.me.line = 286;
+  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMapValues___count;
   fra.me.has_broke = 0;
   fra.me.REG_size = 3;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[1] = NIT_NULL;
   fra.me.REG[2] = NIT_NULL;
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
-  /* ./../lib/standard//collection//hash_collection.nit:239 */
+  /* ../lib/standard/collection/hash_collection.nit:288 */
   REGB0 = TAG_Int(0);
-  /* ./../lib/standard//collection//hash_collection.nit:240 */
+  /* ../lib/standard/collection/hash_collection.nit:289 */
+  fra.me.REG[0] = CALL_standard___collection___hash_collection___HashMapValues___map(fra.me.REG[0])(fra.me.REG[0]);
   fra.me.REG[0] = ATTR_standard___collection___hash_collection___HashCollection____first_item(fra.me.REG[0]);
-  /* ./../lib/standard//collection//hash_collection.nit:241 */
+  /* ../lib/standard/collection/hash_collection.nit:290 */
   while(1) {
     REGB1 = TAG_Bool(fra.me.REG[0]==NIT_NULL);
     if (UNTAG_Bool(REGB1)) {
@@ -1139,7 +1639,7 @@ val_t standard___collection___hash_collection___HashMap___count(val_t p0, val_t
     }
     REGB1 = TAG_Bool(!UNTAG_Bool(REGB1));
     if (UNTAG_Bool(REGB1)) {
-      /* ./../lib/standard//collection//hash_collection.nit:242 */
+      /* ../lib/standard/collection/hash_collection.nit:291 */
       fra.me.REG[2] = ATTR_standard___collection___hash_collection___HashMapNode____value(fra.me.REG[0]);
       REGB1 = TAG_Bool(IS_EQUAL_NN(fra.me.REG[2],fra.me.REG[1]));
       if (UNTAG_Bool(REGB1)) {
@@ -1155,45 +1655,73 @@ val_t standard___collection___hash_collection___HashMap___count(val_t p0, val_t
       }
       if (UNTAG_Bool(REGB1)) {
         REGB1 = TAG_Int(1);
-        /* ./../lib/standard//kernel.nit:218 */
+        /* ../lib/standard/kernel.nit:235 */
         REGB1 = TAG_Int(UNTAG_Int(REGB0)+UNTAG_Int(REGB1));
-        /* ./../lib/standard//collection//hash_collection.nit:242 */
+        /* ../lib/standard/collection/hash_collection.nit:291 */
         REGB0 = REGB1;
       }
-      /* ./../lib/standard//collection//hash_collection.nit:243 */
+      /* ../lib/standard/collection/hash_collection.nit:292 */
       fra.me.REG[2] = ATTR_standard___collection___hash_collection___HashNode____next_item(fra.me.REG[0]);
       fra.me.REG[0] = fra.me.REG[2];
     } else {
-      /* ./../lib/standard//collection//hash_collection.nit:241 */
+      /* ../lib/standard/collection/hash_collection.nit:290 */
       goto label1;
     }
   }
   label1: while(0);
-  /* ./../lib/standard//collection//hash_collection.nit:245 */
+  /* ../lib/standard/collection/hash_collection.nit:294 */
   goto label2;
   label2: while(0);
   stack_frame_head = fra.me.prev;
   return REGB0;
 }
-val_t standard___collection___hash_collection___HashMap___has(val_t p0, val_t p1){
+val_t standard___collection___hash_collection___HashMapValues___first(val_t p0){
+  struct {struct stack_frame_t me;} fra;
+  val_t REGB0;
+  val_t tmp;
+  fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
+  fra.me.file = LOCATE_standard___collection___hash_collection;
+  fra.me.line = 296;
+  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMapValues___first;
+  fra.me.has_broke = 0;
+  fra.me.REG_size = 1;
+  fra.me.nitni_local_ref_head = NULL;
+  fra.me.REG[0] = NIT_NULL;
+  fra.me.REG[0] = p0;
+  /* ../lib/standard/collection/hash_collection.nit:296 */
+  fra.me.REG[0] = CALL_standard___collection___hash_collection___HashMapValues___map(fra.me.REG[0])(fra.me.REG[0]);
+  fra.me.REG[0] = ATTR_standard___collection___hash_collection___HashCollection____first_item(fra.me.REG[0]);
+  REGB0 = TAG_Bool(fra.me.REG[0]==NIT_NULL);
+  if (UNTAG_Bool(REGB0)) {
+    nit_abort("Reciever is null", NULL, LOCATE_standard___collection___hash_collection, 296);
+  }
+  fra.me.REG[0] = ATTR_standard___collection___hash_collection___HashMapNode____value(fra.me.REG[0]);
+  goto label1;
+  label1: while(0);
+  stack_frame_head = fra.me.prev;
+  return fra.me.REG[0];
+}
+val_t standard___collection___hash_collection___HashMapValues___has(val_t p0, val_t p1){
   struct {struct stack_frame_t me; val_t MORE_REG[2];} fra;
   val_t REGB0;
   val_t REGB1;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 248;
-  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMap___has;
+  fra.me.line = 298;
+  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMapValues___has;
   fra.me.has_broke = 0;
   fra.me.REG_size = 3;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[1] = NIT_NULL;
   fra.me.REG[2] = NIT_NULL;
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
-  /* ./../lib/standard//collection//hash_collection.nit:250 */
+  /* ../lib/standard/collection/hash_collection.nit:300 */
+  fra.me.REG[0] = CALL_standard___collection___hash_collection___HashMapValues___map(fra.me.REG[0])(fra.me.REG[0]);
   fra.me.REG[0] = ATTR_standard___collection___hash_collection___HashCollection____first_item(fra.me.REG[0]);
-  /* ./../lib/standard//collection//hash_collection.nit:251 */
+  /* ../lib/standard/collection/hash_collection.nit:301 */
   while(1) {
     REGB0 = TAG_Bool(fra.me.REG[0]==NIT_NULL);
     if (UNTAG_Bool(REGB0)) {
@@ -1209,7 +1737,7 @@ val_t standard___collection___hash_collection___HashMap___has(val_t p0, val_t p1
     }
     REGB0 = TAG_Bool(!UNTAG_Bool(REGB0));
     if (UNTAG_Bool(REGB0)) {
-      /* ./../lib/standard//collection//hash_collection.nit:252 */
+      /* ../lib/standard/collection/hash_collection.nit:302 */
       fra.me.REG[2] = ATTR_standard___collection___hash_collection___HashMapNode____value(fra.me.REG[0]);
       REGB0 = TAG_Bool(IS_EQUAL_NN(fra.me.REG[2],fra.me.REG[1]));
       if (UNTAG_Bool(REGB0)) {
@@ -1227,16 +1755,16 @@ val_t standard___collection___hash_collection___HashMap___has(val_t p0, val_t p1
         REGB0 = TAG_Bool(true);
         goto label1;
       }
-      /* ./../lib/standard//collection//hash_collection.nit:253 */
+      /* ../lib/standard/collection/hash_collection.nit:303 */
       fra.me.REG[2] = ATTR_standard___collection___hash_collection___HashNode____next_item(fra.me.REG[0]);
       fra.me.REG[0] = fra.me.REG[2];
     } else {
-      /* ./../lib/standard//collection//hash_collection.nit:251 */
+      /* ../lib/standard/collection/hash_collection.nit:301 */
       goto label2;
     }
   }
   label2: while(0);
-  /* ./../lib/standard//collection//hash_collection.nit:255 */
+  /* ../lib/standard/collection/hash_collection.nit:305 */
   REGB1 = TAG_Bool(false);
   REGB0 = REGB1;
   goto label1;
@@ -1244,25 +1772,27 @@ val_t standard___collection___hash_collection___HashMap___has(val_t p0, val_t p1
   stack_frame_head = fra.me.prev;
   return REGB0;
 }
-val_t standard___collection___hash_collection___HashMap___has_only(val_t p0, val_t p1){
+val_t standard___collection___hash_collection___HashMapValues___has_only(val_t p0, val_t p1){
   struct {struct stack_frame_t me; val_t MORE_REG[2];} fra;
   val_t REGB0;
   val_t REGB1;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 258;
-  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMap___has_only;
+  fra.me.line = 308;
+  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMapValues___has_only;
   fra.me.has_broke = 0;
   fra.me.REG_size = 3;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[1] = NIT_NULL;
   fra.me.REG[2] = NIT_NULL;
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
-  /* ./../lib/standard//collection//hash_collection.nit:260 */
+  /* ../lib/standard/collection/hash_collection.nit:310 */
+  fra.me.REG[0] = CALL_standard___collection___hash_collection___HashMapValues___map(fra.me.REG[0])(fra.me.REG[0]);
   fra.me.REG[0] = ATTR_standard___collection___hash_collection___HashCollection____first_item(fra.me.REG[0]);
-  /* ./../lib/standard//collection//hash_collection.nit:261 */
+  /* ../lib/standard/collection/hash_collection.nit:311 */
   while(1) {
     REGB0 = TAG_Bool(fra.me.REG[0]==NIT_NULL);
     if (UNTAG_Bool(REGB0)) {
@@ -1278,7 +1808,7 @@ val_t standard___collection___hash_collection___HashMap___has_only(val_t p0, val
     }
     REGB0 = TAG_Bool(!UNTAG_Bool(REGB0));
     if (UNTAG_Bool(REGB0)) {
-      /* ./../lib/standard//collection//hash_collection.nit:262 */
+      /* ../lib/standard/collection/hash_collection.nit:312 */
       fra.me.REG[2] = ATTR_standard___collection___hash_collection___HashMapNode____value(fra.me.REG[0]);
       REGB0 = TAG_Bool(IS_EQUAL_NN(fra.me.REG[2],fra.me.REG[1]));
       if (UNTAG_Bool(REGB0)) {
@@ -1297,16 +1827,16 @@ val_t standard___collection___hash_collection___HashMap___has_only(val_t p0, val
         REGB0 = TAG_Bool(false);
         goto label1;
       }
-      /* ./../lib/standard//collection//hash_collection.nit:263 */
+      /* ../lib/standard/collection/hash_collection.nit:313 */
       fra.me.REG[2] = ATTR_standard___collection___hash_collection___HashNode____next_item(fra.me.REG[0]);
       fra.me.REG[0] = fra.me.REG[2];
     } else {
-      /* ./../lib/standard//collection//hash_collection.nit:261 */
+      /* ../lib/standard/collection/hash_collection.nit:311 */
       goto label2;
     }
   }
   label2: while(0);
-  /* ./../lib/standard//collection//hash_collection.nit:265 */
+  /* ../lib/standard/collection/hash_collection.nit:315 */
   REGB1 = TAG_Bool(true);
   REGB0 = REGB1;
   goto label1;
@@ -1314,76 +1844,110 @@ val_t standard___collection___hash_collection___HashMap___has_only(val_t p0, val
   stack_frame_head = fra.me.prev;
   return REGB0;
 }
-void standard___collection___hash_collection___HashMap_____braeq(val_t p0, val_t p1, val_t p2){
-  struct {struct stack_frame_t me; val_t MORE_REG[3];} fra;
+val_t standard___collection___hash_collection___HashMapValues___is_empty(val_t p0){
+  struct {struct stack_frame_t me;} fra;
   val_t REGB0;
-  val_t REGB1;
-  val_t REGB2;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 268;
-  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMap_____braeq;
+  fra.me.line = 318;
+  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMapValues___is_empty;
   fra.me.has_broke = 0;
-  fra.me.REG_size = 4;
+  fra.me.REG_size = 1;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
-  fra.me.REG[1] = NIT_NULL;
-  fra.me.REG[2] = NIT_NULL;
-  fra.me.REG[3] = NIT_NULL;
   fra.me.REG[0] = p0;
-  fra.me.REG[1] = p1;
-  fra.me.REG[2] = p2;
-  /* ./../lib/standard//collection//hash_collection.nit:270 */
-  REGB0 = CALL_standard___collection___hash_collection___HashCollection___index_at(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1]);
-  /* ./../lib/standard//collection//hash_collection.nit:271 */
-  fra.me.REG[3] = CALL_standard___collection___hash_collection___HashCollection___node_at_idx(fra.me.REG[0])(fra.me.REG[0], REGB0, fra.me.REG[1]);
-  /* ./../lib/standard//collection//hash_collection.nit:272 */
-  REGB1 = TAG_Bool(fra.me.REG[3]==NIT_NULL);
-  if (UNTAG_Bool(REGB1)) {
-  } else {
-    REGB2 = TAG_Bool(fra.me.REG[3]==NIT_NULL);
-    if (UNTAG_Bool(REGB2)) {
-      REGB2 = TAG_Bool(false);
-      REGB1 = REGB2;
-    } else {
-      REGB2 = CALL_standard___kernel___Object_____eqeq(fra.me.REG[3])(fra.me.REG[3], NIT_NULL);
-      REGB1 = REGB2;
-    }
-  }
-  REGB1 = TAG_Bool(!UNTAG_Bool(REGB1));
-  if (UNTAG_Bool(REGB1)) {
-    /* ./../lib/standard//collection//hash_collection.nit:273 */
-    ATTR_standard___collection___hash_collection___HashNode____key(fra.me.REG[3]) = fra.me.REG[1];
-    /* ./../lib/standard//collection//hash_collection.nit:274 */
-    ATTR_standard___collection___hash_collection___HashMapNode____value(fra.me.REG[3]) = fra.me.REG[2];
-  } else {
-    /* ./../lib/standard//collection//hash_collection.nit:276 */
-    fra.me.REG[2] = NEW_HashMapNode_standard___collection___hash_collection___HashMapNode___init(fra.me.REG[1], fra.me.REG[2]);
-    CALL_standard___collection___hash_collection___HashCollection___store(fra.me.REG[0])(fra.me.REG[0], REGB0, fra.me.REG[2]);
-  }
+  /* ../lib/standard/collection/hash_collection.nit:318 */
+  fra.me.REG[0] = CALL_standard___collection___hash_collection___HashMapValues___map(fra.me.REG[0])(fra.me.REG[0]);
+  REGB0 = CALL_standard___collection___abstract_collection___MapRead___is_empty(fra.me.REG[0])(fra.me.REG[0]);
+  goto label1;
+  label1: while(0);
+  stack_frame_head = fra.me.prev;
+  return REGB0;
+}
+val_t standard___collection___hash_collection___HashMapValues___length(val_t p0){
+  struct {struct stack_frame_t me;} fra;
+  val_t REGB0;
+  val_t tmp;
+  fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
+  fra.me.file = LOCATE_standard___collection___hash_collection;
+  fra.me.line = 319;
+  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMapValues___length;
+  fra.me.has_broke = 0;
+  fra.me.REG_size = 1;
+  fra.me.nitni_local_ref_head = NULL;
+  fra.me.REG[0] = NIT_NULL;
+  fra.me.REG[0] = p0;
+  /* ../lib/standard/collection/hash_collection.nit:319 */
+  fra.me.REG[0] = CALL_standard___collection___hash_collection___HashMapValues___map(fra.me.REG[0])(fra.me.REG[0]);
+  REGB0 = CALL_standard___collection___abstract_collection___MapRead___length(fra.me.REG[0])(fra.me.REG[0]);
+  goto label1;
+  label1: while(0);
+  stack_frame_head = fra.me.prev;
+  return REGB0;
+}
+val_t standard___collection___hash_collection___HashMapValues___iterator(val_t p0){
+  struct {struct stack_frame_t me;} fra;
+  val_t tmp;
+  fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
+  fra.me.file = LOCATE_standard___collection___hash_collection;
+  fra.me.line = 321;
+  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMapValues___iterator;
+  fra.me.has_broke = 0;
+  fra.me.REG_size = 1;
+  fra.me.nitni_local_ref_head = NULL;
+  fra.me.REG[0] = NIT_NULL;
+  fra.me.REG[0] = p0;
+  /* ../lib/standard/collection/hash_collection.nit:321 */
+  fra.me.REG[0] = CALL_standard___collection___hash_collection___HashMapValues___map(fra.me.REG[0])(fra.me.REG[0]);
+  fra.me.REG[0] = CALL_standard___collection___abstract_collection___MapRead___iterator(fra.me.REG[0])(fra.me.REG[0]);
+  fra.me.REG[0] = NEW_MapValuesIterator_standard___collection___abstract_collection___MapValuesIterator___init(fra.me.REG[0]);
+  goto label1;
+  label1: while(0);
+  stack_frame_head = fra.me.prev;
+  return fra.me.REG[0];
+}
+void standard___collection___hash_collection___HashMapValues___clear(val_t p0){
+  struct {struct stack_frame_t me;} fra;
+  val_t tmp;
+  fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
+  fra.me.file = LOCATE_standard___collection___hash_collection;
+  fra.me.line = 323;
+  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMapValues___clear;
+  fra.me.has_broke = 0;
+  fra.me.REG_size = 1;
+  fra.me.nitni_local_ref_head = NULL;
+  fra.me.REG[0] = NIT_NULL;
+  fra.me.REG[0] = p0;
+  /* ../lib/standard/collection/hash_collection.nit:323 */
+  fra.me.REG[0] = CALL_standard___collection___hash_collection___HashMapValues___map(fra.me.REG[0])(fra.me.REG[0]);
+  CALL_standard___collection___abstract_collection___Map___clear(fra.me.REG[0])(fra.me.REG[0]);
   stack_frame_head = fra.me.prev;
   return;
 }
-void standard___collection___hash_collection___HashMap___remove(val_t p0, val_t p1){
+void standard___collection___hash_collection___HashMapValues___remove(val_t p0, val_t p1){
   struct {struct stack_frame_t me; val_t MORE_REG[3];} fra;
   val_t REGB0;
   val_t REGB1;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 280;
-  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMap___remove;
+  fra.me.line = 325;
+  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMapValues___remove;
   fra.me.has_broke = 0;
   fra.me.REG_size = 4;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[1] = NIT_NULL;
   fra.me.REG[2] = NIT_NULL;
   fra.me.REG[3] = NIT_NULL;
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
-  /* ./../lib/standard//collection//hash_collection.nit:282 */
+  /* ../lib/standard/collection/hash_collection.nit:327 */
+  fra.me.REG[0] = CALL_standard___collection___hash_collection___HashMapValues___map(fra.me.REG[0])(fra.me.REG[0]);
+  /* ../lib/standard/collection/hash_collection.nit:328 */
   fra.me.REG[2] = ATTR_standard___collection___hash_collection___HashCollection____first_item(fra.me.REG[0]);
-  /* ./../lib/standard//collection//hash_collection.nit:283 */
+  /* ../lib/standard/collection/hash_collection.nit:329 */
   while(1) {
     REGB0 = TAG_Bool(fra.me.REG[2]==NIT_NULL);
     if (UNTAG_Bool(REGB0)) {
@@ -1399,7 +1963,7 @@ void standard___collection___hash_collection___HashMap___remove(val_t p0, val_t
     }
     REGB0 = TAG_Bool(!UNTAG_Bool(REGB0));
     if (UNTAG_Bool(REGB0)) {
-      /* ./../lib/standard//collection//hash_collection.nit:284 */
+      /* ../lib/standard/collection/hash_collection.nit:330 */
       fra.me.REG[3] = ATTR_standard___collection___hash_collection___HashMapNode____value(fra.me.REG[2]);
       REGB0 = TAG_Bool(IS_EQUAL_NN(fra.me.REG[3],fra.me.REG[1]));
       if (UNTAG_Bool(REGB0)) {
@@ -1414,22 +1978,22 @@ void standard___collection___hash_collection___HashMap___remove(val_t p0, val_t
         }
       }
       if (UNTAG_Bool(REGB0)) {
-        /* ./../lib/standard//collection//hash_collection.nit:285 */
+        /* ../lib/standard/collection/hash_collection.nit:331 */
         REGB0 = TAG_Bool(ATTR_standard___collection___hash_collection___HashNode____key(fra.me.REG[2])!=NIT_NULL);
         if (UNTAG_Bool(REGB0)) {
         } else {
-          nit_abort("Uninitialized attribute %s", "_key", LOCATE_standard___collection___hash_collection, 285);
+          nit_abort("Uninitialized attribute %s", "_key", LOCATE_standard___collection___hash_collection, 331);
         }
         fra.me.REG[3] = ATTR_standard___collection___hash_collection___HashNode____key(fra.me.REG[2]);
         CALL_standard___collection___hash_collection___HashCollection___remove_node(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[3]);
-        /* ./../lib/standard//collection//hash_collection.nit:286 */
+        /* ../lib/standard/collection/hash_collection.nit:332 */
         goto label1;
       }
-      /* ./../lib/standard//collection//hash_collection.nit:288 */
+      /* ../lib/standard/collection/hash_collection.nit:334 */
       fra.me.REG[3] = ATTR_standard___collection___hash_collection___HashNode____next_item(fra.me.REG[2]);
       fra.me.REG[2] = fra.me.REG[3];
     } else {
-      /* ./../lib/standard//collection//hash_collection.nit:283 */
+      /* ../lib/standard/collection/hash_collection.nit:329 */
       goto label2;
     }
   }
@@ -1438,82 +2002,113 @@ void standard___collection___hash_collection___HashMap___remove(val_t p0, val_t
   stack_frame_head = fra.me.prev;
   return;
 }
-void standard___collection___hash_collection___HashMap___remove_at(val_t p0, val_t p1){
-  struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
+void standard___collection___hash_collection___HashMapValues___remove_all(val_t p0, val_t p1){
+  struct {struct stack_frame_t me; val_t MORE_REG[3];} fra;
+  val_t REGB0;
+  val_t REGB1;
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 292;
-  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMap___remove_at;
+  fra.me.line = 338;
+  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMapValues___remove_all;
   fra.me.has_broke = 0;
-  fra.me.REG_size = 2;
+  fra.me.REG_size = 4;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[1] = NIT_NULL;
+  fra.me.REG[2] = NIT_NULL;
+  fra.me.REG[3] = NIT_NULL;
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
-  /* ./../lib/standard//collection//hash_collection.nit:292 */
-  CALL_standard___collection___hash_collection___HashCollection___remove_node(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1]);
-  stack_frame_head = fra.me.prev;
-  return;
-}
-void standard___collection___hash_collection___HashMap___clear(val_t p0){
-  struct {struct stack_frame_t me;} fra;
-  val_t tmp;
-  fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
-  fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 294;
-  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMap___clear;
-  fra.me.has_broke = 0;
-  fra.me.REG_size = 1;
-  fra.me.REG[0] = NIT_NULL;
-  fra.me.REG[0] = p0;
-  /* ./../lib/standard//collection//hash_collection.nit:294 */
-  CALL_standard___collection___hash_collection___HashCollection___raz(fra.me.REG[0])(fra.me.REG[0]);
+  /* ../lib/standard/collection/hash_collection.nit:340 */
+  fra.me.REG[0] = CALL_standard___collection___hash_collection___HashMapValues___map(fra.me.REG[0])(fra.me.REG[0]);
+  /* ../lib/standard/collection/hash_collection.nit:341 */
+  fra.me.REG[2] = ATTR_standard___collection___hash_collection___HashCollection____first_item(fra.me.REG[0]);
+  /* ../lib/standard/collection/hash_collection.nit:342 */
+  while(1) {
+    REGB0 = TAG_Bool(fra.me.REG[2]==NIT_NULL);
+    if (UNTAG_Bool(REGB0)) {
+    } else {
+      REGB1 = TAG_Bool(fra.me.REG[2]==NIT_NULL);
+      if (UNTAG_Bool(REGB1)) {
+        REGB1 = TAG_Bool(false);
+        REGB0 = REGB1;
+      } else {
+        REGB1 = CALL_standard___kernel___Object_____eqeq(fra.me.REG[2])(fra.me.REG[2], NIT_NULL);
+        REGB0 = REGB1;
+      }
+    }
+    REGB0 = TAG_Bool(!UNTAG_Bool(REGB0));
+    if (UNTAG_Bool(REGB0)) {
+      /* ../lib/standard/collection/hash_collection.nit:343 */
+      fra.me.REG[3] = ATTR_standard___collection___hash_collection___HashMapNode____value(fra.me.REG[2]);
+      REGB0 = TAG_Bool(IS_EQUAL_NN(fra.me.REG[3],fra.me.REG[1]));
+      if (UNTAG_Bool(REGB0)) {
+      } else {
+        REGB1 = TAG_Bool(fra.me.REG[3]==NIT_NULL);
+        if (UNTAG_Bool(REGB1)) {
+          REGB1 = TAG_Bool(false);
+          REGB0 = REGB1;
+        } else {
+          REGB1 = CALL_standard___kernel___Object_____eqeq(fra.me.REG[3])(fra.me.REG[3], fra.me.REG[1]);
+          REGB0 = REGB1;
+        }
+      }
+      if (UNTAG_Bool(REGB0)) {
+        /* ../lib/standard/collection/hash_collection.nit:344 */
+        REGB0 = TAG_Bool(ATTR_standard___collection___hash_collection___HashNode____key(fra.me.REG[2])!=NIT_NULL);
+        if (UNTAG_Bool(REGB0)) {
+        } else {
+          nit_abort("Uninitialized attribute %s", "_key", LOCATE_standard___collection___hash_collection, 344);
+        }
+        fra.me.REG[3] = ATTR_standard___collection___hash_collection___HashNode____key(fra.me.REG[2]);
+        CALL_standard___collection___hash_collection___HashCollection___remove_node(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[3]);
+      }
+      /* ../lib/standard/collection/hash_collection.nit:346 */
+      fra.me.REG[3] = ATTR_standard___collection___hash_collection___HashNode____next_item(fra.me.REG[2]);
+      fra.me.REG[2] = fra.me.REG[3];
+    } else {
+      /* ../lib/standard/collection/hash_collection.nit:342 */
+      goto label1;
+    }
+  }
+  label1: while(0);
   stack_frame_head = fra.me.prev;
   return;
 }
-void standard___collection___hash_collection___HashMap___init(val_t p0, int* init_table){
-  int itpos2 = VAL2OBJ(p0)->vft[INIT_TABLE_POS_standard___collection___hash_collection___HashMap].i;
+void standard___collection___hash_collection___HashMapValues___init(val_t p0, val_t p1, int* init_table){
+  int itpos4 = VAL2OBJ(p0)->vft[INIT_TABLE_POS_standard___collection___hash_collection___HashMapValues].i;
   struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
-  val_t REGB0;
   val_t tmp;
-  if (init_table[itpos2]) return;
+  if (init_table[itpos4]) return;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 296;
-  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMap___init;
+  fra.me.line = 0;
+  fra.me.meth = LOCATE_standard___collection___hash_collection___HashMapValues___init;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[1] = NIT_NULL;
   fra.me.REG[0] = p0;
-  /* ./../lib/standard//collection//hash_collection.nit:296 */
-  fra.me.REG[1] = fra.me.REG[0];
-  CALL_standard___collection___hash_collection___HashCollection___init(fra.me.REG[0])(fra.me.REG[0], init_table);
-  /* ./../lib/standard//collection//hash_collection.nit:298 */
-  REGB0 = TAG_Int(0);
-  ATTR_standard___collection___hash_collection___HashCollection____capacity(fra.me.REG[1]) = REGB0;
-  /* ./../lib/standard//collection//hash_collection.nit:299 */
-  REGB0 = TAG_Int(0);
-  ATTR_standard___collection___hash_collection___HashCollection____length(fra.me.REG[1]) = REGB0;
-  /* ./../lib/standard//collection//hash_collection.nit:300 */
-  REGB0 = TAG_Int(0);
-  CALL_standard___collection___hash_collection___HashCollection___enlarge(fra.me.REG[1])(fra.me.REG[1], REGB0);
+  fra.me.REG[1] = p1;
+  ATTR_standard___collection___hash_collection___HashMapValues_____atmap(fra.me.REG[0]) = fra.me.REG[1];
   stack_frame_head = fra.me.prev;
-  init_table[itpos2] = 1;
+  init_table[itpos4] = 1;
   return;
 }
 void standard___collection___hash_collection___HashMapNode___init(val_t p0, val_t p1, val_t p2, int* init_table){
-  int itpos3 = VAL2OBJ(p0)->vft[INIT_TABLE_POS_standard___collection___hash_collection___HashMapNode].i;
+  int itpos5 = VAL2OBJ(p0)->vft[INIT_TABLE_POS_standard___collection___hash_collection___HashMapNode].i;
   struct {struct stack_frame_t me; val_t MORE_REG[3];} fra;
   val_t tmp;
-  if (init_table[itpos3]) return;
+  if (init_table[itpos5]) return;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 309;
+  fra.me.line = 356;
   fra.me.meth = LOCATE_standard___collection___hash_collection___HashMapNode___init;
   fra.me.has_broke = 0;
   fra.me.REG_size = 4;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[1] = NIT_NULL;
   fra.me.REG[2] = NIT_NULL;
@@ -1521,14 +2116,14 @@ void standard___collection___hash_collection___HashMapNode___init(val_t p0, val_
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
   fra.me.REG[2] = p2;
-  /* ./../lib/standard//collection//hash_collection.nit:309 */
+  /* ../lib/standard/collection/hash_collection.nit:356 */
   fra.me.REG[3] = fra.me.REG[0];
-  /* ./../lib/standard//collection//hash_collection.nit:311 */
+  /* ../lib/standard/collection/hash_collection.nit:358 */
   CALL_standard___collection___hash_collection___HashNode___init(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1], init_table);
-  /* ./../lib/standard//collection//hash_collection.nit:312 */
+  /* ../lib/standard/collection/hash_collection.nit:359 */
   ATTR_standard___collection___hash_collection___HashMapNode____value(fra.me.REG[3]) = fra.me.REG[2];
   stack_frame_head = fra.me.prev;
-  init_table[itpos3] = 1;
+  init_table[itpos5] = 1;
   return;
 }
 val_t standard___collection___hash_collection___HashMapIterator___is_ok(val_t p0){
@@ -1538,13 +2133,14 @@ val_t standard___collection___hash_collection___HashMapIterator___is_ok(val_t p0
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 318;
+  fra.me.line = 365;
   fra.me.meth = LOCATE_standard___collection___hash_collection___HashMapIterator___is_ok;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[0] = p0;
-  /* ./../lib/standard//collection//hash_collection.nit:318 */
+  /* ../lib/standard/collection/hash_collection.nit:365 */
   fra.me.REG[0] = ATTR_standard___collection___hash_collection___HashMapIterator____node(fra.me.REG[0]);
   REGB0 = TAG_Bool(fra.me.REG[0]==NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
@@ -1570,23 +2166,24 @@ val_t standard___collection___hash_collection___HashMapIterator___item(val_t p0)
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 320;
+  fra.me.line = 367;
   fra.me.meth = LOCATE_standard___collection___hash_collection___HashMapIterator___item;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[0] = p0;
-  /* ./../lib/standard//collection//hash_collection.nit:322 */
-  REGB0 = CALL_standard___collection___abstract_collection___Iterator___is_ok(fra.me.REG[0])(fra.me.REG[0]);
+  /* ../lib/standard/collection/hash_collection.nit:369 */
+  REGB0 = CALL_standard___collection___abstract_collection___MapIterator___is_ok(fra.me.REG[0])(fra.me.REG[0]);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Assert failed", NULL, LOCATE_standard___collection___hash_collection, 322);
+    nit_abort("Assert failed", NULL, LOCATE_standard___collection___hash_collection, 369);
   }
-  /* ./../lib/standard//collection//hash_collection.nit:323 */
+  /* ../lib/standard/collection/hash_collection.nit:370 */
   fra.me.REG[0] = ATTR_standard___collection___hash_collection___HashMapIterator____node(fra.me.REG[0]);
   REGB0 = TAG_Bool(fra.me.REG[0]==NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
-    nit_abort("Reciever is null", NULL, LOCATE_standard___collection___hash_collection, 323);
+    nit_abort("Reciever is null", NULL, LOCATE_standard___collection___hash_collection, 370);
   }
   fra.me.REG[0] = ATTR_standard___collection___hash_collection___HashMapNode____value(fra.me.REG[0]);
   goto label1;
@@ -1600,28 +2197,29 @@ val_t standard___collection___hash_collection___HashMapIterator___key(val_t p0){
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 332;
+  fra.me.line = 379;
   fra.me.meth = LOCATE_standard___collection___hash_collection___HashMapIterator___key;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[0] = p0;
-  /* ./../lib/standard//collection//hash_collection.nit:334 */
-  REGB0 = CALL_standard___collection___abstract_collection___Iterator___is_ok(fra.me.REG[0])(fra.me.REG[0]);
+  /* ../lib/standard/collection/hash_collection.nit:381 */
+  REGB0 = CALL_standard___collection___abstract_collection___MapIterator___is_ok(fra.me.REG[0])(fra.me.REG[0]);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Assert failed", NULL, LOCATE_standard___collection___hash_collection, 334);
+    nit_abort("Assert failed", NULL, LOCATE_standard___collection___hash_collection, 381);
   }
-  /* ./../lib/standard//collection//hash_collection.nit:335 */
+  /* ../lib/standard/collection/hash_collection.nit:382 */
   fra.me.REG[0] = ATTR_standard___collection___hash_collection___HashMapIterator____node(fra.me.REG[0]);
   REGB0 = TAG_Bool(fra.me.REG[0]==NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
-    nit_abort("Reciever is null", NULL, LOCATE_standard___collection___hash_collection, 335);
+    nit_abort("Reciever is null", NULL, LOCATE_standard___collection___hash_collection, 382);
   }
   REGB0 = TAG_Bool(ATTR_standard___collection___hash_collection___HashNode____key(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_key", LOCATE_standard___collection___hash_collection, 335);
+    nit_abort("Uninitialized attribute %s", "_key", LOCATE_standard___collection___hash_collection, 382);
   }
   fra.me.REG[0] = ATTR_standard___collection___hash_collection___HashNode____key(fra.me.REG[0]);
   goto label1;
@@ -1635,24 +2233,25 @@ void standard___collection___hash_collection___HashMapIterator___next(val_t p0){
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 338;
+  fra.me.line = 385;
   fra.me.meth = LOCATE_standard___collection___hash_collection___HashMapIterator___next;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[1] = NIT_NULL;
   fra.me.REG[0] = p0;
-  /* ./../lib/standard//collection//hash_collection.nit:340 */
-  REGB0 = CALL_standard___collection___abstract_collection___Iterator___is_ok(fra.me.REG[0])(fra.me.REG[0]);
+  /* ../lib/standard/collection/hash_collection.nit:387 */
+  REGB0 = CALL_standard___collection___abstract_collection___MapIterator___is_ok(fra.me.REG[0])(fra.me.REG[0]);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Assert failed", NULL, LOCATE_standard___collection___hash_collection, 340);
+    nit_abort("Assert failed", NULL, LOCATE_standard___collection___hash_collection, 387);
   }
-  /* ./../lib/standard//collection//hash_collection.nit:341 */
+  /* ../lib/standard/collection/hash_collection.nit:388 */
   fra.me.REG[1] = ATTR_standard___collection___hash_collection___HashMapIterator____node(fra.me.REG[0]);
   REGB0 = TAG_Bool(fra.me.REG[1]==NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
-    nit_abort("Reciever is null", NULL, LOCATE_standard___collection___hash_collection, 341);
+    nit_abort("Reciever is null", NULL, LOCATE_standard___collection___hash_collection, 388);
   }
   fra.me.REG[1] = ATTR_standard___collection___hash_collection___HashNode____next_item(fra.me.REG[1]);
   ATTR_standard___collection___hash_collection___HashMapIterator____node(fra.me.REG[0]) = fra.me.REG[1];
@@ -1660,27 +2259,28 @@ void standard___collection___hash_collection___HashMapIterator___next(val_t p0){
   return;
 }
 void standard___collection___hash_collection___HashMapIterator___init(val_t p0, val_t p1, int* init_table){
-  int itpos4 = VAL2OBJ(p0)->vft[INIT_TABLE_POS_standard___collection___hash_collection___HashMapIterator].i;
+  int itpos6 = VAL2OBJ(p0)->vft[INIT_TABLE_POS_standard___collection___hash_collection___HashMapIterator].i;
   struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
   val_t tmp;
-  if (init_table[itpos4]) return;
+  if (init_table[itpos6]) return;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 350;
+  fra.me.line = 397;
   fra.me.meth = LOCATE_standard___collection___hash_collection___HashMapIterator___init;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[1] = NIT_NULL;
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
-  /* ./../lib/standard//collection//hash_collection.nit:352 */
+  /* ../lib/standard/collection/hash_collection.nit:399 */
   ATTR_standard___collection___hash_collection___HashMapIterator____map(fra.me.REG[0]) = fra.me.REG[1];
-  /* ./../lib/standard//collection//hash_collection.nit:353 */
+  /* ../lib/standard/collection/hash_collection.nit:400 */
   fra.me.REG[1] = CALL_standard___collection___hash_collection___HashCollection___first_item(fra.me.REG[1])(fra.me.REG[1]);
   ATTR_standard___collection___hash_collection___HashMapIterator____node(fra.me.REG[0]) = fra.me.REG[1];
   stack_frame_head = fra.me.prev;
-  init_table[itpos4] = 1;
+  init_table[itpos6] = 1;
   return;
 }
 val_t standard___collection___hash_collection___HashSet___length(val_t p0){
@@ -1689,17 +2289,18 @@ val_t standard___collection___hash_collection___HashSet___length(val_t p0){
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 361;
+  fra.me.line = 410;
   fra.me.meth = LOCATE_standard___collection___hash_collection___HashSet___length;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[0] = p0;
-  /* ./../lib/standard//collection//hash_collection.nit:361 */
+  /* ../lib/standard/collection/hash_collection.nit:410 */
   REGB0 = TAG_Bool(ATTR_standard___collection___hash_collection___HashCollection____length(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___hash_collection, 361);
+    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___hash_collection, 410);
   }
   REGB0 = ATTR_standard___collection___hash_collection___HashCollection____length(fra.me.REG[0]);
   goto label1;
@@ -1715,26 +2316,27 @@ val_t standard___collection___hash_collection___HashSet___is_empty(val_t p0){
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 363;
+  fra.me.line = 412;
   fra.me.meth = LOCATE_standard___collection___hash_collection___HashSet___is_empty;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[0] = p0;
-  /* ./../lib/standard//collection//hash_collection.nit:363 */
+  /* ../lib/standard/collection/hash_collection.nit:412 */
   REGB0 = TAG_Bool(ATTR_standard___collection___hash_collection___HashCollection____length(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___hash_collection, 363);
+    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___hash_collection, 412);
   }
   REGB0 = ATTR_standard___collection___hash_collection___HashCollection____length(fra.me.REG[0]);
   REGB1 = TAG_Int(0);
   REGB2 = TAG_Bool(IS_EQUAL_OO(REGB0,REGB1));
   if (UNTAG_Bool(REGB2)) {
   } else {
-    /* ./../lib/standard//kernel.nit:210 */
+    /* ../lib/standard/kernel.nit:227 */
     REGB1 = TAG_Bool((REGB0)==(REGB1));
-    /* ./../lib/standard//collection//hash_collection.nit:363 */
+    /* ../lib/standard/collection/hash_collection.nit:412 */
     REGB2 = REGB1;
   }
   goto label1;
@@ -1750,17 +2352,18 @@ val_t standard___collection___hash_collection___HashSet___first(val_t p0){
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 365;
+  fra.me.line = 414;
   fra.me.meth = LOCATE_standard___collection___hash_collection___HashSet___first;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[0] = p0;
-  /* ./../lib/standard//collection//hash_collection.nit:367 */
+  /* ../lib/standard/collection/hash_collection.nit:416 */
   REGB0 = TAG_Bool(ATTR_standard___collection___hash_collection___HashCollection____length(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___hash_collection, 367);
+    nit_abort("Uninitialized attribute %s", "_length", LOCATE_standard___collection___hash_collection, 416);
   }
   REGB0 = ATTR_standard___collection___hash_collection___HashCollection____length(fra.me.REG[0]);
   REGB1 = TAG_Int(0);
@@ -1769,23 +2372,23 @@ val_t standard___collection___hash_collection___HashSet___first(val_t p0){
   } else {
     nit_abort("Cast failed", NULL, LOCATE_standard___kernel, 0);
   }
-  /* ./../lib/standard//kernel.nit:217 */
+  /* ../lib/standard/kernel.nit:234 */
   REGB1 = TAG_Bool(UNTAG_Int(REGB0)>UNTAG_Int(REGB1));
-  /* ./../lib/standard//collection//hash_collection.nit:367 */
+  /* ../lib/standard/collection/hash_collection.nit:416 */
   if (UNTAG_Bool(REGB1)) {
   } else {
-    nit_abort("Assert failed", NULL, LOCATE_standard___collection___hash_collection, 367);
+    nit_abort("Assert failed", NULL, LOCATE_standard___collection___hash_collection, 416);
   }
-  /* ./../lib/standard//collection//hash_collection.nit:368 */
+  /* ../lib/standard/collection/hash_collection.nit:417 */
   fra.me.REG[0] = ATTR_standard___collection___hash_collection___HashCollection____first_item(fra.me.REG[0]);
   REGB1 = TAG_Bool(fra.me.REG[0]==NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
-    nit_abort("Reciever is null", NULL, LOCATE_standard___collection___hash_collection, 368);
+    nit_abort("Reciever is null", NULL, LOCATE_standard___collection___hash_collection, 417);
   }
   REGB1 = TAG_Bool(ATTR_standard___collection___hash_collection___HashNode____key(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_key", LOCATE_standard___collection___hash_collection, 368);
+    nit_abort("Uninitialized attribute %s", "_key", LOCATE_standard___collection___hash_collection, 417);
   }
   fra.me.REG[0] = ATTR_standard___collection___hash_collection___HashNode____key(fra.me.REG[0]);
   goto label1;
@@ -1800,15 +2403,16 @@ val_t standard___collection___hash_collection___HashSet___has(val_t p0, val_t p1
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 371;
+  fra.me.line = 420;
   fra.me.meth = LOCATE_standard___collection___hash_collection___HashSet___has;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[1] = NIT_NULL;
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
-  /* ./../lib/standard//collection//hash_collection.nit:373 */
+  /* ../lib/standard/collection/hash_collection.nit:422 */
   fra.me.REG[1] = CALL_standard___collection___hash_collection___HashCollection___node_at(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1]);
   REGB0 = TAG_Bool(fra.me.REG[1]==NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
@@ -1836,20 +2440,21 @@ void standard___collection___hash_collection___HashSet___add(val_t p0, val_t p1)
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 376;
+  fra.me.line = 425;
   fra.me.meth = LOCATE_standard___collection___hash_collection___HashSet___add;
   fra.me.has_broke = 0;
   fra.me.REG_size = 3;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[1] = NIT_NULL;
   fra.me.REG[2] = NIT_NULL;
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
-  /* ./../lib/standard//collection//hash_collection.nit:378 */
+  /* ../lib/standard/collection/hash_collection.nit:427 */
   REGB0 = CALL_standard___collection___hash_collection___HashCollection___index_at(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1]);
-  /* ./../lib/standard//collection//hash_collection.nit:379 */
+  /* ../lib/standard/collection/hash_collection.nit:428 */
   fra.me.REG[2] = CALL_standard___collection___hash_collection___HashCollection___node_at_idx(fra.me.REG[0])(fra.me.REG[0], REGB0, fra.me.REG[1]);
-  /* ./../lib/standard//collection//hash_collection.nit:380 */
+  /* ../lib/standard/collection/hash_collection.nit:429 */
   REGB1 = TAG_Bool(fra.me.REG[2]==NIT_NULL);
   if (UNTAG_Bool(REGB1)) {
   } else {
@@ -1864,10 +2469,10 @@ void standard___collection___hash_collection___HashSet___add(val_t p0, val_t p1)
   }
   REGB1 = TAG_Bool(!UNTAG_Bool(REGB1));
   if (UNTAG_Bool(REGB1)) {
-    /* ./../lib/standard//collection//hash_collection.nit:381 */
+    /* ../lib/standard/collection/hash_collection.nit:430 */
     ATTR_standard___collection___hash_collection___HashNode____key(fra.me.REG[2]) = fra.me.REG[1];
   } else {
-    /* ./../lib/standard//collection//hash_collection.nit:383 */
+    /* ../lib/standard/collection/hash_collection.nit:432 */
     fra.me.REG[1] = NEW_HashSetNode_standard___collection___hash_collection___HashSetNode___init(fra.me.REG[1]);
     CALL_standard___collection___hash_collection___HashCollection___store(fra.me.REG[0])(fra.me.REG[0], REGB0, fra.me.REG[1]);
   }
@@ -1879,15 +2484,16 @@ void standard___collection___hash_collection___HashSet___remove(val_t p0, val_t
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 387;
+  fra.me.line = 436;
   fra.me.meth = LOCATE_standard___collection___hash_collection___HashSet___remove;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[1] = NIT_NULL;
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
-  /* ./../lib/standard//collection//hash_collection.nit:387 */
+  /* ../lib/standard/collection/hash_collection.nit:436 */
   CALL_standard___collection___hash_collection___HashCollection___remove_node(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1]);
   stack_frame_head = fra.me.prev;
   return;
@@ -1897,13 +2503,14 @@ void standard___collection___hash_collection___HashSet___clear(val_t p0){
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 389;
+  fra.me.line = 438;
   fra.me.meth = LOCATE_standard___collection___hash_collection___HashSet___clear;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[0] = p0;
-  /* ./../lib/standard//collection//hash_collection.nit:389 */
+  /* ../lib/standard/collection/hash_collection.nit:438 */
   CALL_standard___collection___hash_collection___HashCollection___raz(fra.me.REG[0])(fra.me.REG[0]);
   stack_frame_head = fra.me.prev;
   return;
@@ -1913,13 +2520,14 @@ val_t standard___collection___hash_collection___HashSet___iterator(val_t p0){
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 391;
+  fra.me.line = 440;
   fra.me.meth = LOCATE_standard___collection___hash_collection___HashSet___iterator;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[0] = p0;
-  /* ./../lib/standard//collection//hash_collection.nit:391 */
+  /* ../lib/standard/collection/hash_collection.nit:440 */
   fra.me.REG[0] = NEW_HashSetIterator_standard___collection___hash_collection___HashSetIterator___init(fra.me.REG[0]);
   goto label1;
   label1: while(0);
@@ -1927,61 +2535,63 @@ val_t standard___collection___hash_collection___HashSet___iterator(val_t p0){
   return fra.me.REG[0];
 }
 void standard___collection___hash_collection___HashSet___init(val_t p0, int* init_table){
-  int itpos5 = VAL2OBJ(p0)->vft[INIT_TABLE_POS_standard___collection___hash_collection___HashSet].i;
+  int itpos7 = VAL2OBJ(p0)->vft[INIT_TABLE_POS_standard___collection___hash_collection___HashSet].i;
   struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
   val_t REGB0;
   val_t tmp;
-  if (init_table[itpos5]) return;
+  if (init_table[itpos7]) return;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 393;
+  fra.me.line = 442;
   fra.me.meth = LOCATE_standard___collection___hash_collection___HashSet___init;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[1] = NIT_NULL;
   fra.me.REG[0] = p0;
-  /* ./../lib/standard//collection//hash_collection.nit:393 */
+  /* ../lib/standard/collection/hash_collection.nit:442 */
   fra.me.REG[1] = fra.me.REG[0];
   CALL_standard___collection___hash_collection___HashCollection___init(fra.me.REG[0])(fra.me.REG[0], init_table);
-  /* ./../lib/standard//collection//hash_collection.nit:395 */
+  /* ../lib/standard/collection/hash_collection.nit:444 */
   REGB0 = TAG_Int(0);
   ATTR_standard___collection___hash_collection___HashCollection____capacity(fra.me.REG[1]) = REGB0;
-  /* ./../lib/standard//collection//hash_collection.nit:396 */
+  /* ../lib/standard/collection/hash_collection.nit:445 */
   REGB0 = TAG_Int(0);
   ATTR_standard___collection___hash_collection___HashCollection____length(fra.me.REG[1]) = REGB0;
-  /* ./../lib/standard//collection//hash_collection.nit:397 */
+  /* ../lib/standard/collection/hash_collection.nit:446 */
   REGB0 = TAG_Int(0);
   CALL_standard___collection___hash_collection___HashCollection___enlarge(fra.me.REG[1])(fra.me.REG[1], REGB0);
   stack_frame_head = fra.me.prev;
-  init_table[itpos5] = 1;
+  init_table[itpos7] = 1;
   return;
 }
 void standard___collection___hash_collection___HashSetNode___init(val_t p0, val_t p1, int* init_table){
-  int itpos6 = VAL2OBJ(p0)->vft[INIT_TABLE_POS_standard___collection___hash_collection___HashSetNode].i;
+  int itpos8 = VAL2OBJ(p0)->vft[INIT_TABLE_POS_standard___collection___hash_collection___HashSetNode].i;
   struct {struct stack_frame_t me; val_t MORE_REG[3];} fra;
   val_t tmp;
-  if (init_table[itpos6]) return;
+  if (init_table[itpos8]) return;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 405;
+  fra.me.line = 454;
   fra.me.meth = LOCATE_standard___collection___hash_collection___HashSetNode___init;
   fra.me.has_broke = 0;
   fra.me.REG_size = 4;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[1] = NIT_NULL;
   fra.me.REG[2] = NIT_NULL;
   fra.me.REG[3] = NIT_NULL;
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
-  /* ./../lib/standard//collection//hash_collection.nit:405 */
+  /* ../lib/standard/collection/hash_collection.nit:454 */
   fra.me.REG[2] = fra.me.REG[0];
   fra.me.REG[3] = fra.me.REG[1];
   CALL_standard___collection___hash_collection___HashNode___init(fra.me.REG[0])(fra.me.REG[0], fra.me.REG[1], init_table);
-  /* ./../lib/standard//collection//hash_collection.nit:407 */
+  /* ../lib/standard/collection/hash_collection.nit:456 */
   ATTR_standard___collection___hash_collection___HashNode____key(fra.me.REG[2]) = fra.me.REG[3];
   stack_frame_head = fra.me.prev;
-  init_table[itpos6] = 1;
+  init_table[itpos8] = 1;
   return;
 }
 val_t standard___collection___hash_collection___HashSetIterator___is_ok(val_t p0){
@@ -1991,13 +2601,14 @@ val_t standard___collection___hash_collection___HashSetIterator___is_ok(val_t p0
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 413;
+  fra.me.line = 462;
   fra.me.meth = LOCATE_standard___collection___hash_collection___HashSetIterator___is_ok;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[0] = p0;
-  /* ./../lib/standard//collection//hash_collection.nit:413 */
+  /* ../lib/standard/collection/hash_collection.nit:462 */
   fra.me.REG[0] = ATTR_standard___collection___hash_collection___HashSetIterator____node(fra.me.REG[0]);
   REGB0 = TAG_Bool(fra.me.REG[0]==NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
@@ -2023,28 +2634,29 @@ val_t standard___collection___hash_collection___HashSetIterator___item(val_t p0)
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 415;
+  fra.me.line = 464;
   fra.me.meth = LOCATE_standard___collection___hash_collection___HashSetIterator___item;
   fra.me.has_broke = 0;
   fra.me.REG_size = 1;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[0] = p0;
-  /* ./../lib/standard//collection//hash_collection.nit:417 */
+  /* ../lib/standard/collection/hash_collection.nit:466 */
   REGB0 = CALL_standard___collection___abstract_collection___Iterator___is_ok(fra.me.REG[0])(fra.me.REG[0]);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Assert failed", NULL, LOCATE_standard___collection___hash_collection, 417);
+    nit_abort("Assert failed", NULL, LOCATE_standard___collection___hash_collection, 466);
   }
-  /* ./../lib/standard//collection//hash_collection.nit:418 */
+  /* ../lib/standard/collection/hash_collection.nit:467 */
   fra.me.REG[0] = ATTR_standard___collection___hash_collection___HashSetIterator____node(fra.me.REG[0]);
   REGB0 = TAG_Bool(fra.me.REG[0]==NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
-    nit_abort("Reciever is null", NULL, LOCATE_standard___collection___hash_collection, 418);
+    nit_abort("Reciever is null", NULL, LOCATE_standard___collection___hash_collection, 467);
   }
   REGB0 = TAG_Bool(ATTR_standard___collection___hash_collection___HashNode____key(fra.me.REG[0])!=NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Uninitialized attribute %s", "_key", LOCATE_standard___collection___hash_collection, 418);
+    nit_abort("Uninitialized attribute %s", "_key", LOCATE_standard___collection___hash_collection, 467);
   }
   fra.me.REG[0] = ATTR_standard___collection___hash_collection___HashNode____key(fra.me.REG[0]);
   goto label1;
@@ -2058,24 +2670,25 @@ void standard___collection___hash_collection___HashSetIterator___next(val_t p0){
   val_t tmp;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 421;
+  fra.me.line = 470;
   fra.me.meth = LOCATE_standard___collection___hash_collection___HashSetIterator___next;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[1] = NIT_NULL;
   fra.me.REG[0] = p0;
-  /* ./../lib/standard//collection//hash_collection.nit:423 */
+  /* ../lib/standard/collection/hash_collection.nit:472 */
   REGB0 = CALL_standard___collection___abstract_collection___Iterator___is_ok(fra.me.REG[0])(fra.me.REG[0]);
   if (UNTAG_Bool(REGB0)) {
   } else {
-    nit_abort("Assert failed", NULL, LOCATE_standard___collection___hash_collection, 423);
+    nit_abort("Assert failed", NULL, LOCATE_standard___collection___hash_collection, 472);
   }
-  /* ./../lib/standard//collection//hash_collection.nit:424 */
+  /* ../lib/standard/collection/hash_collection.nit:473 */
   fra.me.REG[1] = ATTR_standard___collection___hash_collection___HashSetIterator____node(fra.me.REG[0]);
   REGB0 = TAG_Bool(fra.me.REG[1]==NIT_NULL);
   if (UNTAG_Bool(REGB0)) {
-    nit_abort("Reciever is null", NULL, LOCATE_standard___collection___hash_collection, 424);
+    nit_abort("Reciever is null", NULL, LOCATE_standard___collection___hash_collection, 473);
   }
   fra.me.REG[1] = ATTR_standard___collection___hash_collection___HashNode____next_item(fra.me.REG[1]);
   ATTR_standard___collection___hash_collection___HashSetIterator____node(fra.me.REG[0]) = fra.me.REG[1];
@@ -2083,26 +2696,27 @@ void standard___collection___hash_collection___HashSetIterator___next(val_t p0){
   return;
 }
 void standard___collection___hash_collection___HashSetIterator___init(val_t p0, val_t p1, int* init_table){
-  int itpos7 = VAL2OBJ(p0)->vft[INIT_TABLE_POS_standard___collection___hash_collection___HashSetIterator].i;
+  int itpos9 = VAL2OBJ(p0)->vft[INIT_TABLE_POS_standard___collection___hash_collection___HashSetIterator].i;
   struct {struct stack_frame_t me; val_t MORE_REG[1];} fra;
   val_t tmp;
-  if (init_table[itpos7]) return;
+  if (init_table[itpos9]) return;
   fra.me.prev = stack_frame_head; stack_frame_head = &fra.me;
   fra.me.file = LOCATE_standard___collection___hash_collection;
-  fra.me.line = 433;
+  fra.me.line = 482;
   fra.me.meth = LOCATE_standard___collection___hash_collection___HashSetIterator___init;
   fra.me.has_broke = 0;
   fra.me.REG_size = 2;
+  fra.me.nitni_local_ref_head = NULL;
   fra.me.REG[0] = NIT_NULL;
   fra.me.REG[1] = NIT_NULL;
   fra.me.REG[0] = p0;
   fra.me.REG[1] = p1;
-  /* ./../lib/standard//collection//hash_collection.nit:435 */
+  /* ../lib/standard/collection/hash_collection.nit:484 */
   ATTR_standard___collection___hash_collection___HashSetIterator____set(fra.me.REG[0]) = fra.me.REG[1];
-  /* ./../lib/standard//collection//hash_collection.nit:436 */
+  /* ../lib/standard/collection/hash_collection.nit:485 */
   fra.me.REG[1] = ATTR_standard___collection___hash_collection___HashCollection____first_item(fra.me.REG[1]);
   ATTR_standard___collection___hash_collection___HashSetIterator____node(fra.me.REG[0]) = fra.me.REG[1];
   stack_frame_head = fra.me.prev;
-  init_table[itpos7] = 1;
+  init_table[itpos9] = 1;
   return;
 }