diff --git a/Sources/SwiftDriver/Driver/OutputFileMap.swift b/Sources/SwiftDriver/Driver/OutputFileMap.swift
index 0fb974f7b..f0fa0ca59 100644
--- a/Sources/SwiftDriver/Driver/OutputFileMap.swift
+++ b/Sources/SwiftDriver/Driver/OutputFileMap.swift
@@ -138,7 +138,7 @@ public struct OutputFileMap: Hashable, Codable {
     try fileSystem.writeFileContents(file, bytes: ByteString(contents))
   }
 
-  /// Human-readable texual representation
+  /// Human-readable textual representation
   var description: String {
     var result = ""
     func outputPairDescription(inputPath: VirtualPath, outputPair: (FileType, VirtualPath))
@@ -229,7 +229,7 @@ fileprivate struct OutputFileMapJSON: Codable {
 
   /// Converts into virtual path entries.
   func toVirtualOutputFileMap() throws -> [VirtualPath : [FileType : VirtualPath]] {
-    // Add filter here due to a bug of TSC, see swift-tools-support-core#191
+    // TODO: Remove the filter after swift-tools-support-core#191
     Dictionary(try entries.filter { $0.0 != "" }.map { input, entry in
       (try VirtualPath(path: input), try entry.paths.mapValues(VirtualPath.init(path:)))
     }, uniquingKeysWith: { $1 })
diff --git a/Sources/SwiftDriver/IncrementalCompilation/DirectAndTransitiveCollections.swift b/Sources/SwiftDriver/IncrementalCompilation/DirectAndTransitiveCollections.swift
index b4c3d1762..455c827ff 100644
--- a/Sources/SwiftDriver/IncrementalCompilation/DirectAndTransitiveCollections.swift
+++ b/Sources/SwiftDriver/IncrementalCompilation/DirectAndTransitiveCollections.swift
@@ -9,6 +9,7 @@
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
+
 // Use the type system to ensure that dependencies are transitively closed
 // without doing too much work at the leaves of the call tree
 public struct Transitively {}
@@ -81,4 +82,4 @@ public typealias TransitivelyInvalidatedSourceSet = InvalidatedSet<Transitively,
 public typealias TransitivelyInvalidatedInputArray = InvalidatedArray<Transitively, TypedVirtualPath>
 public typealias TransitivelyInvalidatedInputSet = InvalidatedSet<Transitively, TypedVirtualPath>
 public typealias DirectlyInvalidatedNodeArray = InvalidatedArray<Directly, ModuleDependencyGraph.Node>
-public typealias DirectlyInvalidatedNodeSet = InvalidatedSet<Directly, ModuleDependencyGraph.Node>
\ No newline at end of file
+public typealias DirectlyInvalidatedNodeSet = InvalidatedSet<Directly, ModuleDependencyGraph.Node>
diff --git a/Sources/SwiftDriver/IncrementalCompilation/ModuleDependencyGraphParts/Integrator.swift b/Sources/SwiftDriver/IncrementalCompilation/ModuleDependencyGraphParts/Integrator.swift
index a19324088..c0cdc0738 100644
--- a/Sources/SwiftDriver/IncrementalCompilation/ModuleDependencyGraphParts/Integrator.swift
+++ b/Sources/SwiftDriver/IncrementalCompilation/ModuleDependencyGraphParts/Integrator.swift
@@ -234,7 +234,6 @@ extension ModuleDependencyGraph.Integrator {
   }
 }
 
-
 // MARK: - verification
 extension ModuleDependencyGraph.Integrator {
   @discardableResult
diff --git a/Tests/SwiftDriverTests/IncrementalCompilationTests.swift b/Tests/SwiftDriverTests/IncrementalCompilationTests.swift
index 8a7ebc3fd..f64e4bd7f 100644
--- a/Tests/SwiftDriverTests/IncrementalCompilationTests.swift
+++ b/Tests/SwiftDriverTests/IncrementalCompilationTests.swift
@@ -91,7 +91,7 @@ final class NonincrementalCompilationTests: XCTestCase {
                         VirtualPath(path: "/Volumes/gazorp.swift"):
                           InputInfo(status: .needsNonCascadingBuild,
                                     previousModTime:  Date(legacyDriverSecsAndNanos: [0, 0]))
-                      ])
+                       ])
   #endif
   }
 
diff --git a/Tests/SwiftDriverTests/XCTestManifests.swift b/Tests/SwiftDriverTests/XCTestManifests.swift
index 2945aa3d0..ac7e29bcd 100644
--- a/Tests/SwiftDriverTests/XCTestManifests.swift
+++ b/Tests/SwiftDriverTests/XCTestManifests.swift
@@ -117,6 +117,8 @@ extension NonincrementalCompilationTests {
     //   `swift test --generate-linuxmain`
     // to regenerate.
     #if os(Windows)
+    // FIXME: There's some frustrating bug with Yams' date decoding, disable tests on Windows
+    // to prevent unexpected crashes.
     static let __allTests__NonincrementalCompilationTests: [(String, (XCTestCase) -> () -> Void)] = []
     #else
     static let __allTests__NonincrementalCompilationTests = [