diff --git a/binder/scope.cpp b/binder/scope.cpp
index 22f53e1d214257b3c8091fb2803ee1f151c8bf9a..60764033e813ad7dfe4a25efb401f7b3b76ffbbb 100644
--- a/binder/scope.cpp
+++ b/binder/scope.cpp
@@ -475,7 +475,7 @@ Scope::InsertResult GlobalScope::InsertImpl(const util::StringView &name, Variab
         if (const bool exported = node->IsClassDefinition() ? node->Parent()->IsExported() : node->IsExported();
             !exported) {
             if (!node->IsDefaultExported()) {
-                return Scope::InsertResult {{}, false};
+                return std::make_pair(Bindings().end(), false);
             }
         }
     }
diff --git a/binder/scope.h b/binder/scope.h
index 57a16b50bf75eec1085c4ac2b33f15a9e993ac60..c7a3d6a936cf5f3acd2066b530068ae6f5603b4a 100644
--- a/binder/scope.h
+++ b/binder/scope.h
@@ -73,7 +73,7 @@ public:
     NO_MOVE_SEMANTIC(Scope);
 
     using VariableMap = ArenaUnorderedMap<util::StringView, Variable *>;
-    using InsertResult = std::pair<VariableMap::iterator, bool>;
+    using InsertResult = std::pair<VariableMap::const_iterator, bool>;
 
     virtual ScopeType Type() const = 0;
 
diff --git a/parser/parserImpl.h b/parser/parserImpl.h
index e680020b4db286c6e315cb61926509e77b38cc17..ae9944037b22f26f691a24831465a86e0f06460a 100644
--- a/parser/parserImpl.h
+++ b/parser/parserImpl.h
@@ -792,7 +792,7 @@ protected:
         return binder_;
     }
 
-    binder::Scope::VariableMap SavedBindings() const
+    const binder::Scope::VariableMap &SavedBindings() const
     {
         return saved_bindings_;
     }