3 files changed, 4 insertions, 13 deletions
diff --git a/src/mongo/db/pipeline/abt/abt_document_source_visitor.cpp b/src/mongo/db/pipeline/abt/abt_document_source_visitor.cpp
index a2bf9a28656..582f3263bfb 100644
--- a/src/mongo/db/pipeline/abt/abt_document_source_visitor.cpp
+++ b/src/mongo/db/pipeline/abt/abt_document_source_visitor.cpp
@@ -59,7 +59,6 @@
 #include "mongo/db/pipeline/document_source_operation_metrics.h"
 #include "mongo/db/pipeline/document_source_out.h"
 #include "mongo/db/pipeline/document_source_plan_cache_stats.h"
-#include "mongo/db/pipeline/document_source_query_stats.h"
 #include "mongo/db/pipeline/document_source_queue.h"
 #include "mongo/db/pipeline/document_source_redact.h"
 #include "mongo/db/pipeline/document_source_replace_root.h"
@@ -180,7 +179,7 @@ private:
     }
 
     void processProjectedPaths(const projection_executor::InclusionNode& node) {
-        OrderedPathSet preservedPaths;
+        std::set<std::string> preservedPaths;
         node.reportProjectedPaths(&preservedPaths);
 
         for (const std::string& preservedPathStr : preservedPaths) {
@@ -195,7 +194,7 @@ private:
     void processComputedPaths(const projection_executor::InclusionNode& node,
                               const std::string& rootProjection,
                               const bool isAddingFields) {
-        OrderedPathSet computedPaths;
+        std::set<std::string> computedPaths;
         StringMap<std::string> renamedPaths;
         node.reportComputedPaths(&computedPaths, &renamedPaths);
 
@@ -269,7 +268,7 @@ private:
     }
 
     void visitExclusionNode(const projection_executor::ExclusionNode& node) {
-        OrderedPathSet preservedPaths;
+        std::set<std::string> preservedPaths;
         node.reportProjectedPaths(&preservedPaths);
 
         for (const std::string& preservedPathStr : preservedPaths) {
@@ -607,10 +606,6 @@ public:
         unsupportedStage(source);
     }
 
-    void visit(const DocumentSourceQueryStats* source) override {
-        unsupportedStage(source);
-    }
-
     void visit(const DocumentSourceUnionWith* source) override {
         auto entry = _ctx.getNode();
         ProjectionName unionProjName = entry._rootProjection;
diff --git a/src/mongo/db/pipeline/abt/agg_expression_visitor.cpp b/src/mongo/db/pipeline/abt/agg_expression_visitor.cpp
index 70e44feef97..55b44e4d37b 100644
--- a/src/mongo/db/pipeline/abt/agg_expression_visitor.cpp
+++ b/src/mongo/db/pipeline/abt/agg_expression_visitor.cpp
@@ -735,10 +735,6 @@ public:
         unsupportedExpression("tsIncrement");
     }
 
-    void visit(const ExpressionInternalKeyStringValue* expr) override final {
-        unsupportedExpression(expr->getOpName());
-    }
-
 private:
     /**
      * Shared logic for $and, $or. Converts each child into an EExpression that evaluates to Boolean
diff --git a/src/mongo/db/pipeline/abt/field_map_builder.h b/src/mongo/db/pipeline/abt/field_map_builder.h
index 4eedf150644..af593d38cd3 100644
--- a/src/mongo/db/pipeline/abt/field_map_builder.h
+++ b/src/mongo/db/pipeline/abt/field_map_builder.h
@@ -57,7 +57,7 @@ struct FieldMapEntry {
     bool _hasDrop = false;
     std::string _constVarName;
 
-    OrderedPathSet _childPaths;
+    std::set<std::string> _childPaths;
 };
 
 class FieldMapBuilder {