diff --git a/tools/gn/output_conversion_unittest.cc b/tools/gn/output_conversion_unittest.cc
index 8115796..2e4146d 100644
--- a/tools/gn/output_conversion_unittest.cc
+++ b/tools/gn/output_conversion_unittest.cc
@@ -107,7 +107,7 @@
   ConvertValueToOutput(settings(), Value(nullptr, std::move(new_scope)),
                        Value(nullptr, "string"), result, &err);
   EXPECT_FALSE(err.has_error());
-  EXPECT_EQ(result.str(), "\"{\n  v = \"hello\"\n  _private = \"hello\"\n}\"");
+  EXPECT_EQ(result.str(), "\"{\n  _private = \"hello\"\n  v = \"hello\"\n}\"");
 }
 
 TEST_F(OutputConversionTest, ValueString) {
@@ -171,7 +171,7 @@
   ConvertValueToOutput(settings(), Value(nullptr, std::move(new_scope)),
                        Value(nullptr, "value"), result, &err);
   EXPECT_FALSE(err.has_error());
-  EXPECT_EQ(result.str(), "{\n  v = \"hello\"\n  _private = \"hello\"\n}");
+  EXPECT_EQ(result.str(), "{\n  _private = \"hello\"\n  v = \"hello\"\n}");
 }
 
 TEST_F(OutputConversionTest, JSON) {
diff --git a/tools/gn/scope.h b/tools/gn/scope.h
index 10219c0..5e9745a 100644
--- a/tools/gn/scope.h
+++ b/tools/gn/scope.h
@@ -38,8 +38,7 @@
 // variables. So you should use a non-const containing scope whenever possible.
 class Scope {
  public:
-  typedef std::unordered_map<base::StringPiece, Value, base::StringPieceHash>
-      KeyValueMap;
+  typedef std::map<base::StringPiece, Value> KeyValueMap;
   // Holds an owning list of Items.
   typedef std::vector<std::unique_ptr<Item>> ItemVector;
 
@@ -348,7 +347,7 @@
   // scope, or a const containing scope. The reason is that when we're doing
   // a new target, we want to refer to the base_config scope which will be read
   // by multiple threads at the same time, so we REALLY want it to be const.
-  // When you jsut do a nested {}, however, we sometimes want to be able to
+  // When you just do a nested {}, however, we sometimes want to be able to
   // change things (especially marking unused vars).
   const Scope* const_containing_;
   Scope* mutable_containing_;