--- deliantra/server/common/object.C	2018/11/18 15:19:48	1.367
+++ deliantra/server/common/object.C	2018/12/05 19:03:26	1.368
@@ -151,7 +151,7 @@
 
   uid.seq = ++cur.seq;
 
-  if (expect_false (cur.seq >= seq_next_save))
+  if (ecb_expect_false (cur.seq >= seq_next_save))
     {
       seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
       write_uuid (UUID_GAP, false);
@@ -1134,14 +1134,14 @@
 
       if (pl && pl->is_player ())
         {
-          if (expect_false (pl->contr->combat_ob == this))
+          if (ecb_expect_false (pl->contr->combat_ob == this))
             {
               pl->apply (pl->contr->combat_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
               pl->contr->combat_ob = 0;
               if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
             }
 
-          if (expect_false (pl->contr->ranged_ob == this))
+          if (ecb_expect_false (pl->contr->ranged_ob == this))
             {
               pl->apply (pl->contr->ranged_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
               pl->contr->ranged_ob = 0;
@@ -1150,7 +1150,7 @@
 
           pl->contr->queue_stats_update ();
 
-          if (expect_false (glow_radius) && pl->is_on_map ())
+          if (ecb_expect_false (glow_radius) && pl->is_on_map ())
             update_all_los (pl->map, pl->x, pl->y);
         }
     }
@@ -2536,6 +2536,8 @@
     add (kvp->key, kvp->value);
 
   reverse ();
+
+  return *this;
 }
 
 object::depth_iterator::depth_iterator (object *container)