diff --git a/src/extensions/statistics-extension.cc b/src/extensions/statistics-extension.cc
index bb5ee33..76dcd43 100644
--- a/src/extensions/statistics-extension.cc
+++ b/src/extensions/statistics-extension.cc
@@ -4,6 +4,10 @@
 
 #include "src/extensions/statistics-extension.h"
 
+#include "src/counters.h"
+#include "src/heap/heap-inl.h"
+#include "src/isolate.h"
+
 namespace v8 {
 namespace internal {
 
@@ -11,9 +15,8 @@
     "native function getV8Statistics();";
 
 
-v8::Handle<v8::FunctionTemplate> StatisticsExtension::GetNativeFunctionTemplate(
-    v8::Isolate* isolate,
-    v8::Handle<v8::String> str) {
+v8::Local<v8::FunctionTemplate> StatisticsExtension::GetNativeFunctionTemplate(
+    v8::Isolate* isolate, v8::Local<v8::String> str) {
   DCHECK(strcmp(*v8::String::Utf8Value(str), "getV8Statistics") == 0);
   return v8::FunctionTemplate::New(isolate, StatisticsExtension::GetCounters);
 }
@@ -24,8 +27,11 @@
                        StatsCounter* counter,
                        const char* name) {
   if (counter->Enabled()) {
-    object->Set(v8::String::NewFromUtf8(isolate, name),
-                v8::Number::New(isolate, *counter->GetInternalPointer()));
+    object->Set(isolate->GetCurrentContext(),
+                v8::String::NewFromUtf8(isolate, name, NewStringType::kNormal)
+                    .ToLocalChecked(),
+                v8::Number::New(isolate, *counter->GetInternalPointer()))
+        .FromJust();
   }
 }
 
@@ -33,8 +39,10 @@
                       v8::Local<v8::Object> object,
                       intptr_t value,
                       const char* name) {
-  object->Set(v8::String::NewFromUtf8(isolate, name),
-              v8::Number::New(isolate, static_cast<double>(value)));
+  object->Set(isolate->GetCurrentContext(),
+              v8::String::NewFromUtf8(isolate, name, NewStringType::kNormal)
+                  .ToLocalChecked(),
+              v8::Number::New(isolate, static_cast<double>(value))).FromJust();
 }
 
 
@@ -42,8 +50,10 @@
                         v8::Local<v8::Object> object,
                         int64_t value,
                         const char* name) {
-  object->Set(v8::String::NewFromUtf8(isolate, name),
-              v8::Number::New(isolate, static_cast<double>(value)));
+  object->Set(isolate->GetCurrentContext(),
+              v8::String::NewFromUtf8(isolate, name, NewStringType::kNormal)
+                  .ToLocalChecked(),
+              v8::Number::New(isolate, static_cast<double>(value))).FromJust();
 }
 
 
@@ -54,7 +64,9 @@
 
   if (args.Length() > 0) {  // GC if first argument evaluates to true.
     if (args[0]->IsBoolean() &&
-        args[0]->ToBoolean(args.GetIsolate())->Value()) {
+        args[0]
+            ->BooleanValue(args.GetIsolate()->GetCurrentContext())
+            .FromMaybe(false)) {
       heap->CollectAllGarbage(Heap::kNoGCFlags, "counters extension");
     }
   }
@@ -62,90 +74,72 @@
   Counters* counters = isolate->counters();
   v8::Local<v8::Object> result = v8::Object::New(args.GetIsolate());
 
-#define ADD_COUNTER(name, caption)                                            \
-  AddCounter(args.GetIsolate(), result, counters->name(), #name);
+  struct StatisticsCounter {
+    v8::internal::StatsCounter* counter;
+    const char* name;
+  };
+  const StatisticsCounter counter_list[] = {
+#define ADD_COUNTER(name, caption) \
+  { counters->name(), #name }      \
+  ,
 
-  STATS_COUNTER_LIST_1(ADD_COUNTER)
-  STATS_COUNTER_LIST_2(ADD_COUNTER)
+      STATS_COUNTER_LIST_1(ADD_COUNTER) STATS_COUNTER_LIST_2(ADD_COUNTER)
 #undef ADD_COUNTER
-#define ADD_COUNTER(name)                                                      \
-  AddCounter(args.GetIsolate(), result, counters->count_of_##name(),           \
-             "count_of_" #name);                                               \
-  AddCounter(args.GetIsolate(), result, counters->size_of_##name(),            \
-             "size_of_" #name);
+#define ADD_COUNTER(name)                            \
+  { counters->count_of_##name(), "count_of_" #name } \
+  , {counters->size_of_##name(), "size_of_" #name},
 
-  INSTANCE_TYPE_LIST(ADD_COUNTER)
+          INSTANCE_TYPE_LIST(ADD_COUNTER)
 #undef ADD_COUNTER
-#define ADD_COUNTER(name)                                                      \
-  AddCounter(args.GetIsolate(), result, counters->count_of_CODE_TYPE_##name(), \
-             "count_of_CODE_TYPE_" #name);                                     \
-  AddCounter(args.GetIsolate(), result, counters->size_of_CODE_TYPE_##name(),  \
-             "size_of_CODE_TYPE_" #name);
+#define ADD_COUNTER(name)                                                \
+  { counters->count_of_CODE_TYPE_##name(), "count_of_CODE_TYPE_" #name } \
+  , {counters->size_of_CODE_TYPE_##name(), "size_of_CODE_TYPE_" #name},
 
-  CODE_KIND_LIST(ADD_COUNTER)
+              CODE_KIND_LIST(ADD_COUNTER)
 #undef ADD_COUNTER
-#define ADD_COUNTER(name)                                                      \
-  AddCounter(args.GetIsolate(), result,                                        \
-             counters->count_of_FIXED_ARRAY_##name(),                          \
-             "count_of_FIXED_ARRAY_" #name);                                   \
-  AddCounter(args.GetIsolate(), result,                                        \
-             counters->size_of_FIXED_ARRAY_##name(),                           \
-             "size_of_FIXED_ARRAY_" #name);
+#define ADD_COUNTER(name)                                                    \
+  { counters->count_of_FIXED_ARRAY_##name(), "count_of_FIXED_ARRAY_" #name } \
+  , {counters->size_of_FIXED_ARRAY_##name(), "size_of_FIXED_ARRAY_" #name},
 
-  FIXED_ARRAY_SUB_INSTANCE_TYPE_LIST(ADD_COUNTER)
+                  FIXED_ARRAY_SUB_INSTANCE_TYPE_LIST(ADD_COUNTER)
 #undef ADD_COUNTER
+  };  // End counter_list array.
 
-  AddNumber(args.GetIsolate(), result, isolate->memory_allocator()->Size(),
-            "total_committed_bytes");
-  AddNumber(args.GetIsolate(), result, heap->new_space()->Size(),
-            "new_space_live_bytes");
-  AddNumber(args.GetIsolate(), result, heap->new_space()->Available(),
-            "new_space_available_bytes");
-  AddNumber(args.GetIsolate(), result, heap->new_space()->CommittedMemory(),
-            "new_space_commited_bytes");
-  AddNumber(args.GetIsolate(), result, heap->old_pointer_space()->Size(),
-            "old_pointer_space_live_bytes");
-  AddNumber(args.GetIsolate(), result, heap->old_pointer_space()->Available(),
-            "old_pointer_space_available_bytes");
-  AddNumber(args.GetIsolate(), result,
-            heap->old_pointer_space()->CommittedMemory(),
-            "old_pointer_space_commited_bytes");
-  AddNumber(args.GetIsolate(), result, heap->old_data_space()->Size(),
-            "old_data_space_live_bytes");
-  AddNumber(args.GetIsolate(), result, heap->old_data_space()->Available(),
-            "old_data_space_available_bytes");
-  AddNumber(args.GetIsolate(), result,
-            heap->old_data_space()->CommittedMemory(),
-            "old_data_space_commited_bytes");
-  AddNumber(args.GetIsolate(), result, heap->code_space()->Size(),
-            "code_space_live_bytes");
-  AddNumber(args.GetIsolate(), result, heap->code_space()->Available(),
-            "code_space_available_bytes");
-  AddNumber(args.GetIsolate(), result, heap->code_space()->CommittedMemory(),
-            "code_space_commited_bytes");
-  AddNumber(args.GetIsolate(), result, heap->cell_space()->Size(),
-            "cell_space_live_bytes");
-  AddNumber(args.GetIsolate(), result, heap->cell_space()->Available(),
-            "cell_space_available_bytes");
-  AddNumber(args.GetIsolate(), result, heap->cell_space()->CommittedMemory(),
-            "cell_space_commited_bytes");
-  AddNumber(args.GetIsolate(), result, heap->property_cell_space()->Size(),
-            "property_cell_space_live_bytes");
-  AddNumber(args.GetIsolate(), result, heap->property_cell_space()->Available(),
-            "property_cell_space_available_bytes");
-  AddNumber(args.GetIsolate(), result,
-            heap->property_cell_space()->CommittedMemory(),
-            "property_cell_space_commited_bytes");
-  AddNumber(args.GetIsolate(), result, heap->lo_space()->Size(),
-            "lo_space_live_bytes");
-  AddNumber(args.GetIsolate(), result, heap->lo_space()->Available(),
-            "lo_space_available_bytes");
-  AddNumber(args.GetIsolate(), result, heap->lo_space()->CommittedMemory(),
-            "lo_space_commited_bytes");
+  for (size_t i = 0; i < arraysize(counter_list); i++) {
+    AddCounter(args.GetIsolate(), result, counter_list[i].counter,
+               counter_list[i].name);
+  }
+
+  struct StatisticNumber {
+    intptr_t number;
+    const char* name;
+  };
+
+  const StatisticNumber numbers[] = {
+      {isolate->memory_allocator()->Size(), "total_committed_bytes"},
+      {heap->new_space()->Size(), "new_space_live_bytes"},
+      {heap->new_space()->Available(), "new_space_available_bytes"},
+      {heap->new_space()->CommittedMemory(), "new_space_commited_bytes"},
+      {heap->old_space()->Size(), "old_space_live_bytes"},
+      {heap->old_space()->Available(), "old_space_available_bytes"},
+      {heap->old_space()->CommittedMemory(), "old_space_commited_bytes"},
+      {heap->code_space()->Size(), "code_space_live_bytes"},
+      {heap->code_space()->Available(), "code_space_available_bytes"},
+      {heap->code_space()->CommittedMemory(), "code_space_commited_bytes"},
+      {heap->lo_space()->Size(), "lo_space_live_bytes"},
+      {heap->lo_space()->Available(), "lo_space_available_bytes"},
+      {heap->lo_space()->CommittedMemory(), "lo_space_commited_bytes"},
+  };
+
+  for (size_t i = 0; i < arraysize(numbers); i++) {
+    AddNumber(args.GetIsolate(), result, numbers[i].number, numbers[i].name);
+  }
+
   AddNumber64(args.GetIsolate(), result,
               heap->amount_of_external_allocated_memory(),
               "amount_of_external_allocated_memory");
   args.GetReturnValue().Set(result);
 }
 
-} }  // namespace v8::internal
+}  // namespace internal
+}  // namespace v8