diff --git a/swift/xcode-autobuilder/XcodeProjectParser.cpp b/swift/xcode-autobuilder/XcodeProjectParser.cpp
index 19bc40ba35f..072bcaeeee2 100644
--- a/swift/xcode-autobuilder/XcodeProjectParser.cpp
+++ b/swift/xcode-autobuilder/XcodeProjectParser.cpp
@@ -257,7 +257,7 @@ static std::unordered_map<std::string, std::vector<std::string>> collectWorkspac
   // Collect all projects not belonging to any workspace into a separate empty bucket
   for (auto& path : projectFiles.xcodeFiles) {
     if (path.extension() == ".xcodeproj") {
-      if (projectsBelongingToWorkspace.count(path.string())) {
+      if (projectsBelongingToWorkspace.contains(path.string())) {
         continue;
       }
       workspaces[std::string()].push_back(path.string());
diff --git a/swift/xcode-autobuilder/xcode-autobuilder.cpp b/swift/xcode-autobuilder/xcode-autobuilder.cpp
index 0f976d62e80..fd73d30b0ad 100644
--- a/swift/xcode-autobuilder/xcode-autobuilder.cpp
+++ b/swift/xcode-autobuilder/xcode-autobuilder.cpp
@@ -80,7 +80,7 @@ static bool autobuild(const CLIArgs& args) {
     return false;
   } else if (!structure.xcodeEncountered && swiftPackages.empty()) {
     DIAGNOSE_ERROR(noProjectFound,
-                   "`autobuild` could not detect an Xcode project or workspace or Swift package");
+                   "`autobuild` detected neither an Xcode project or workspace, nor a Swift package");
     return false;
   } else if (!xcodeTargets.empty()) {
     LOG_INFO("Building Xcode target: {}", xcodeTargets.front());