diff --git a/build_docs.py b/build_docs.py
index 6596a25..f14cc2b 100755
--- a/build_docs.py
+++ b/build_docs.py
@@ -388,16 +388,16 @@ def setup_switchers(
     - Cross-link various languages in a language switcher
     - Cross-link various versions in a version switcher
     """
-    languages_map = dict(sorted((l.tag, l.name) for l in languages if l.in_prod))
-    versions_map = {v.name: v.picker_label for v in reversed(versions)}
+    language_pairs = sorted((l.tag, l.name) for l in languages if l.in_prod)
+    version_pairs = [(v.name, v.picker_label) for v in reversed(versions)]
 
     switchers_template_file = HERE / "templates" / "switchers.js"
     switchers_path = html_root / "_static" / "switchers.js"
 
     template = Template(switchers_template_file.read_text(encoding="UTF-8"))
     rendered_template = template.safe_substitute(
-        LANGUAGES=json.dumps(languages_map),
-        VERSIONS=json.dumps(versions_map),
+        LANGUAGES=json.dumps(language_pairs),
+        VERSIONS=json.dumps(version_pairs),
     )
     switchers_path.write_text(rendered_template, encoding="UTF-8")
 
diff --git a/templates/switchers.js b/templates/switchers.js
index dd28044..d1a4768 100644
--- a/templates/switchers.js
+++ b/templates/switchers.js
@@ -19,8 +19,8 @@ const _CURRENT_PREFIX = (() => {
   return window.location.pathname.split('/', _NUM_PREFIX_PARTS).join('/') + '/';
 })();
 
-const _ALL_VERSIONS = new Map(Object.entries($VERSIONS));
-const _ALL_LANGUAGES = new Map(Object.entries($LANGUAGES));
+const _ALL_VERSIONS = new Map($VERSIONS);
+const _ALL_LANGUAGES = new Map($LANGUAGES);
 
 /**
  * @param {Map<string, string>} versions