[modules] Minor refactorings in scopes and scopeinfos.

src/debug/liveedit.cc

Index: src/debug/liveedit.cc
diff --git a/src/debug/liveedit.cc b/src/debug/liveedit.cc
index f5cc58348a52571334ef3c207b385b7d60a888c1..6e158f3fd8452ec68b3cdf415e7bdd1df4aefb7f 100644
--- a/src/debug/liveedit.cc
+++ b/src/debug/liveedit.cc
@@ -1904,8 +1904,7 @@ Handle<Object> LiveEditFunctionTracker::SerializeFunctionScope(Scope* scope) {
     ZoneList<Variable*> context_list(current_scope->ContextLocalCount(), zone_);
     ZoneList<Variable*> globals_list(current_scope->ContextGlobalCount(),
                                      zone_);
-    current_scope->CollectStackAndContextLocals(&stack_list, &context_list,
-                                                &globals_list);
+    current_scope->CollectVariables(&stack_list, &context_list, &globals_list);
     for (int i = 0; i < context_list.length(); i++) {
       int context_index = context_list[i]->index() - Context::MIN_CONTEXT_SLOTS;
       int location = scope_info_length + context_index * 2;