diff --git a/src/liballocator/mem-heap.c b/src/liballocator/mem-heap.c
index 318c6d289..7a605aaff 100644
--- a/src/liballocator/mem-heap.c
+++ b/src/liballocator/mem-heap.c
@@ -477,7 +477,7 @@ mem_heap_print( bool dump_block_data) /**< print block with data (true)
 #endif /* MEM_STATS */
 
   __printf("\n");
-} /* mem_PrintHeap */
+} /* mem_heap_print */
 
 /**
  * Check heap consistency
@@ -534,7 +534,7 @@ mem_heap_stat_init()
 
   mem_heap_stats.size = mem_heap.heap_size;
   mem_heap_stats.blocks = 1;
-} /* mem_InitStats */
+} /* mem_heap_stat_init */
 
 /**
  * Account block allocation
diff --git a/src/libcoreint/opcodes.c b/src/libcoreint/opcodes.c
index 18a50ab2b..4aa5c7dc5 100644
--- a/src/libcoreint/opcodes.c
+++ b/src/libcoreint/opcodes.c
@@ -399,9 +399,7 @@ opfunc_loop_inf (OPCODE opdata, struct __int_data *int_data)
 
   int_data->pos = opdata.data.loop_inf.loop_root;
 
-  return ecma_make_completion_value( ECMA_COMPLETION_TYPE_NORMAL,
-                                   ecma_make_simple_value( ECMA_SIMPLE_VALUE_EMPTY),
-                                   ECMA_TARGET_ID_RESERVED);
+  return ecma_make_empty_completion_value();
 }
 
 ecma_completion_value_t
@@ -417,9 +415,7 @@ opfunc_call_1 (OPCODE opdata __unused, struct __int_data *int_data)
   int_data->pos++;
 
   // FIXME
-  return ecma_make_completion_value( ECMA_COMPLETION_TYPE_NORMAL,
-                                   ecma_make_simple_value( ECMA_SIMPLE_VALUE_EMPTY),
-                                   ECMA_TARGET_ID_RESERVED);
+  return ecma_make_empty_completion_value();
 }
 
 ecma_completion_value_t
@@ -433,9 +429,7 @@ opfunc_jmp (OPCODE opdata, struct __int_data *int_data)
 
   int_data->pos = opdata.data.jmp.opcode_idx;
 
-  return ecma_make_completion_value( ECMA_COMPLETION_TYPE_NORMAL,
-                                   ecma_make_simple_value( ECMA_SIMPLE_VALUE_EMPTY),
-                                   ECMA_TARGET_ID_RESERVED);
+  return ecma_make_empty_completion_value();
 }
 
 /**
@@ -761,9 +755,7 @@ opfunc_var_decl(OPCODE opdata, /**< operation data */
 
   int_data->pos++;
 
-  return ecma_make_completion_value( ECMA_COMPLETION_TYPE_NORMAL,
-                                   ecma_make_simple_value( ECMA_SIMPLE_VALUE_EMPTY),
-                                   ECMA_TARGET_ID_RESERVED);
+  return ecma_make_empty_completion_value();
 } /* opfunc_var_decl */
 
 /**
diff --git a/src/libecmaoperations/ecma-conversion.c b/src/libecmaoperations/ecma-conversion.c
index 1922a85b7..af875718e 100644
--- a/src/libecmaoperations/ecma-conversion.c
+++ b/src/libecmaoperations/ecma-conversion.c
@@ -78,9 +78,7 @@ ecma_op_check_object_coercible( ecma_value_t value) /**< ecma-value */
       }
   }
 
-  return ecma_make_completion_value( ECMA_COMPLETION_TYPE_NORMAL,
-                                     ecma_make_simple_value( ECMA_SIMPLE_VALUE_EMPTY),
-                                     ECMA_TARGET_ID_RESERVED);
+  return ecma_make_empty_completion_value();
 } /* ecma_op_check_object_coercible */
 
 /**
diff --git a/src/libecmaoperations/ecma-lex-env.c b/src/libecmaoperations/ecma-lex-env.c
index 8ebcdd735..de7921f2c 100644
--- a/src/libecmaoperations/ecma-lex-env.c
+++ b/src/libecmaoperations/ecma-lex-env.c
@@ -106,9 +106,7 @@ ecma_op_create_mutable_binding(ecma_object_t *lex_env_p, /**< lexical environmen
     }
   }  
 
-  return ecma_make_completion_value( ECMA_COMPLETION_TYPE_NORMAL,
-                                   ecma_make_simple_value( ECMA_SIMPLE_VALUE_EMPTY),
-                                   ECMA_TARGET_ID_RESERVED);
+  return ecma_make_empty_completion_value();
 } /* ecma_op_create_mutable_binding */
 
 /**
@@ -153,9 +151,7 @@ ecma_op_set_mutable_binding(ecma_object_t *lex_env_p, /**< lexical environment *
     }
   }  
 
-  return ecma_make_completion_value( ECMA_COMPLETION_TYPE_NORMAL,
-                                   ecma_make_simple_value( ECMA_SIMPLE_VALUE_EMPTY),
-                                   ECMA_TARGET_ID_RESERVED);
+  return ecma_make_empty_completion_value();
 } /* ecma_op_set_mutable_binding */
 
 /**