[modules] Minor refactorings in scopes and scopeinfos.

src/ast/scopes.h

Index: src/ast/scopes.h
diff --git a/src/ast/scopes.h b/src/ast/scopes.h
index c90a1754d9d62eeb672e84db6a7e424bc13b1052..969c70a75d7b26b918660f7d601de1aaf9763920 100644
--- a/src/ast/scopes.h
+++ b/src/ast/scopes.h
@@ -337,12 +337,11 @@ class Scope: public ZoneObject {
   // ---------------------------------------------------------------------------
   // Variable allocation.
 
-  // Collect stack and context allocated local variables in this scope. Note
-  // that the function variable - if present - is not collected and should be
-  // handled separately.
-  void CollectStackAndContextLocals(ZoneList<Variable*>* stack_locals,
-                                    ZoneList<Variable*>* context_locals,
-                                    ZoneList<Variable*>* context_globals);
+  // Collect variables in this scope. Note that the function variable - if
+  // present - is not collected and should be handled separately.
+  void CollectVariables(ZoneList<Variable*>* stack_locals,
+                        ZoneList<Variable*>* context_locals,
+                        ZoneList<Variable*>* context_globals);
 
   // Result of variable allocation.
   int num_stack_slots() const { return num_stack_slots_; }
@@ -837,7 +836,7 @@ class DeclarationScope : public Scope {
 
 class ModuleScope final : public DeclarationScope {
  public:
-  ModuleScope(Zone* zone, DeclarationScope* script_scope,
+  ModuleScope(DeclarationScope* script_scope,
               AstValueFactory* ast_value_factory);
 
   ModuleDescriptor* module() const {