diff --git a/stdlib/core/Algorithm.swift b/stdlib/core/Algorithm.swift
index 74a0c91dfca..bff01c75d83 100644
--- a/stdlib/core/Algorithm.swift
+++ b/stdlib/core/Algorithm.swift
@@ -161,7 +161,7 @@ public func split<S: Sliceable, R:BooleanType>(
 
 /// Return true iff the the initial elements of `s` are equal to `prefix`.
 public func startsWith<
-  S0: SequenceType, S1: SequenceType
+  S0 : SequenceType, S1 : SequenceType
   where
     S0.Generator.Element == S1.Generator.Element,
     S0.Generator.Element : Equatable
@@ -184,7 +184,7 @@ public func startsWith<
 /// `isEquivalent` is an `equivalence relation
 /// <http://en.wikipedia.org/wiki/Equivalence_relation>`_
 public func startsWith<
-  S0: SequenceType, S1: SequenceType
+  S0 : SequenceType, S1 : SequenceType
   where
     S0.Generator.Element == S1.Generator.Element
 >(s: S0, prefix: S1,
@@ -259,9 +259,7 @@ public struct EnumerateGenerator<
 ///
 /// Note:: idiomatic usage is to call `enumerate` instead of
 /// constructing an `EnumerateSequence` directly.
-public struct EnumerateSequence<
-  Base: SequenceType
-> : SequenceType {
+public struct EnumerateSequence<Base : SequenceType> : SequenceType {
   var base: Base
 
   /// Construct from a `Base` sequence
@@ -415,7 +413,7 @@ public func lexicographicalCompare<
 
 /// Return `true` iff an element in `seq` satisfies `predicate`.
 public func contains<
-  S: SequenceType, L: BooleanType
+  S : SequenceType, L : BooleanType
 >(seq: S, predicate: (S.Generator.Element)->L) -> Bool {
   for a in seq {
     if predicate(a) {
@@ -427,7 +425,7 @@ public func contains<
 
 /// Return `true` iff `x` is in `seq`.
 public func contains<
-  S: SequenceType where S.Generator.Element: Equatable
+  S : SequenceType where S.Generator.Element : Equatable
 >(seq: S, x: S.Generator.Element) -> Bool {
   return contains(seq, { $0 == x })
 }
@@ -435,7 +433,7 @@ public func contains<
 /// Return the result of repeatedly calling `combine` with an
 /// accumulated value initialized to `initial` and each element of
 /// `sequence`, in turn.
-public func reduce<S: SequenceType, U>(
+public func reduce<S : SequenceType, U>(
   sequence: S, initial: U, combine: (U, S.Generator.Element)->U
 ) -> U {
   var result = initial
diff --git a/stdlib/core/Arrays.swift.gyb b/stdlib/core/Arrays.swift.gyb
index b251abac99a..b5e7fe17905 100644
--- a/stdlib/core/Arrays.swift.gyb
+++ b/stdlib/core/Arrays.swift.gyb
@@ -1115,7 +1115,7 @@ func _arrayAppendSequence<
 // Slice<Int> and Array<Int>.
 
 /// Returns true if these arrays contain the same elements.
-public func ==<T: Equatable>(lhs: ${Self}<T>, rhs: ${Self}<T>) -> Bool {
+public func ==<T : Equatable>(lhs: ${Self}<T>, rhs: ${Self}<T>) -> Bool {
   let lhsCount = lhs.count
   if lhsCount != rhs.count {
     return false
@@ -1142,7 +1142,7 @@ public func ==<T: Equatable>(lhs: ${Self}<T>, rhs: ${Self}<T>) -> Bool {
 }
 
 /// Returns true if the arrays do not contain the same elements.
-public func !=<T: Equatable>(lhs: ${Self}<T>, rhs: ${Self}<T>) -> Bool {
+public func !=<T : Equatable>(lhs: ${Self}<T>, rhs: ${Self}<T>) -> Bool {
   return !(lhs == rhs)
 }
 %end
diff --git a/stdlib/core/Optional.swift b/stdlib/core/Optional.swift
index 88699e4a43c..c1eb5c37076 100644
--- a/stdlib/core/Optional.swift
+++ b/stdlib/core/Optional.swift
@@ -106,18 +106,18 @@ func _getOptionalValue<T>(v: T?) -> T {
 
 @transparent
 public // COMPILER_INTRINSIC
-func _injectValueIntoOptional<T>(v: T) -> Optional<T> {
+func _injectValueIntoOptional<T>(v: T) -> T? {
   return .Some(v)
 }
 
 @transparent
 public // COMPILER_INTRINSIC
-func _injectNothingIntoOptional<T>() -> Optional<T> {
+func _injectNothingIntoOptional<T>() -> T? {
   return .None
 }
 
 // Comparisons
-public func == <T: Equatable> (lhs: T?, rhs: T?) -> Bool {
+public func == <T : Equatable> (lhs: T?, rhs: T?) -> Bool {
   switch (lhs,rhs) {
   case (.Some(let l), .Some(let r)):
     return l == r
@@ -128,7 +128,7 @@ public func == <T: Equatable> (lhs: T?, rhs: T?) -> Bool {
   }
 }
 
-public func != <T: Equatable> (lhs: T?, rhs: T?) -> Bool {
+public func != <T : Equatable> (lhs: T?, rhs: T?) -> Bool {
   return !(lhs == rhs)
 }
 
diff --git a/stdlib/core/String.swift b/stdlib/core/String.swift
index f62aad5e4a2..1d945ae9250 100644
--- a/stdlib/core/String.swift
+++ b/stdlib/core/String.swift
@@ -289,7 +289,7 @@ public func _stdlib_compareNSStringDeterministicUnicodeCollation(
 )-> Int32
 #endif
 
-extension String: Equatable {
+extension String : Equatable {
 }
 
 public func ==(lhs: String, rhs: String) -> Bool {
diff --git a/stdlib/objc/XCTest/XCTest.swift b/stdlib/objc/XCTest/XCTest.swift
index 44ce8880d82..984a5fb84d4 100644
--- a/stdlib/objc/XCTest/XCTest.swift
+++ b/stdlib/objc/XCTest/XCTest.swift
@@ -221,7 +221,7 @@ public func XCTAssertFalse(expression: @autoclosure () -> BooleanType, _ message
   }
 }
 
-public func XCTAssertEqual<T: Equatable>(expression1: @autoclosure () -> T, expression2: @autoclosure () -> T, _ message: String = "", file: String = __FILE__, line: UInt = __LINE__) -> Void {
+public func XCTAssertEqual<T : Equatable>(expression1: @autoclosure () -> T, expression2: @autoclosure () -> T, _ message: String = "", file: String = __FILE__, line: UInt = __LINE__) -> Void {
   let assertionType = _XCTAssertionType.Equal
   
   // evaluate each expression exactly once
@@ -260,9 +260,9 @@ public func XCTAssertEqual<T: Equatable>(expression1: @autoclosure () -> T, expr
 //  ContiguousArray<T>
 //  Slice<T>
 //  Array<T>
-//  Dictionary<T,U>
+//  Dictionary<T, U>
 
-public func XCTAssertEqual<T: Equatable>(expression1: @autoclosure () -> Slice<T>, expression2: @autoclosure () -> Slice<T>, _ message: String = "", file: String = __FILE__, line: UInt = __LINE__) -> Void {
+public func XCTAssertEqual<T : Equatable>(expression1: @autoclosure () -> Slice<T>, expression2: @autoclosure () -> Slice<T>, _ message: String = "", file: String = __FILE__, line: UInt = __LINE__) -> Void {
   let assertionType = _XCTAssertionType.Equal
   
   // evaluate each expression exactly once
@@ -297,7 +297,7 @@ public func XCTAssertEqual<T: Equatable>(expression1: @autoclosure () -> Slice<T
   }
 }
 
-public func XCTAssertEqual<T: Equatable>(expression1: @autoclosure () -> ContiguousArray<T>, expression2: @autoclosure () -> ContiguousArray<T>, _ message: String = "", file: String = __FILE__, line: UInt = __LINE__) -> Void {
+public func XCTAssertEqual<T : Equatable>(expression1: @autoclosure () -> ContiguousArray<T>, expression2: @autoclosure () -> ContiguousArray<T>, _ message: String = "", file: String = __FILE__, line: UInt = __LINE__) -> Void {
   let assertionType = _XCTAssertionType.Equal
   
   // evaluate each expression exactly once
@@ -332,12 +332,12 @@ public func XCTAssertEqual<T: Equatable>(expression1: @autoclosure () -> Contigu
   }
 }
 
-public func XCTAssertEqual<T: Equatable>(expression1: @autoclosure () -> Array<T>, expression2: @autoclosure () -> Array<T>, _ message: String = "", file: String = __FILE__, line: UInt = __LINE__) -> Void {
+public func XCTAssertEqual<T : Equatable>(expression1: @autoclosure () -> [T], expression2: @autoclosure () -> [T], _ message: String = "", file: String = __FILE__, line: UInt = __LINE__) -> Void {
   let assertionType = _XCTAssertionType.Equal
   
   // evaluate each expression exactly once
-  var expressionValue1Optional: Array<T>?
-  var expressionValue2Optional: Array<T>?
+  var expressionValue1Optional: [T]?
+  var expressionValue2Optional: [T]?
   
   let result = _XCTRunThrowableBlock {
     expressionValue1Optional = expression1()
@@ -346,8 +346,8 @@ public func XCTAssertEqual<T: Equatable>(expression1: @autoclosure () -> Array<T
   
   switch result {
   case .Success:
-    let expressionValue1: Array<T> = expressionValue1Optional!
-    let expressionValue2: Array<T> = expressionValue2Optional!
+    let expressionValue1: [T] = expressionValue1Optional!
+    let expressionValue2: [T] = expressionValue2Optional!
     
     if expressionValue1 != expressionValue2 {
       // TODO: @auto_string expression1
@@ -367,12 +367,12 @@ public func XCTAssertEqual<T: Equatable>(expression1: @autoclosure () -> Array<T
   }
 }
 
-public func XCTAssertEqual<T, U: Equatable>(expression1: @autoclosure () -> Dictionary<T, U>, expression2: @autoclosure () -> Dictionary<T, U>, _ message: String = "", file: String = __FILE__, line: UInt = __LINE__) -> Void {
+public func XCTAssertEqual<T, U : Equatable>(expression1: @autoclosure () -> [T: U], expression2: @autoclosure () -> [T: U], _ message: String = "", file: String = __FILE__, line: UInt = __LINE__) -> Void {
   let assertionType = _XCTAssertionType.Equal
   
   // evaluate each expression exactly once
-  var expressionValue1Optional: Dictionary<T, U>?
-  var expressionValue2Optional: Dictionary<T, U>?
+  var expressionValue1Optional: [T: U]?
+  var expressionValue2Optional: [T: U]?
   
   let result = _XCTRunThrowableBlock {
     expressionValue1Optional = expression1()
@@ -381,8 +381,8 @@ public func XCTAssertEqual<T, U: Equatable>(expression1: @autoclosure () -> Dict
   
   switch result {
   case .Success:
-    let expressionValue1: Dictionary<T, U> = expressionValue1Optional!
-    let expressionValue2: Dictionary<T, U> = expressionValue2Optional!
+    let expressionValue1: [T: U] = expressionValue1Optional!
+    let expressionValue2: [T: U] = expressionValue2Optional!
     
     if expressionValue1 != expressionValue2 {
       // TODO: @auto_string expression1
@@ -402,7 +402,7 @@ public func XCTAssertEqual<T, U: Equatable>(expression1: @autoclosure () -> Dict
   }
 }
 
-public func XCTAssertNotEqual<T: Equatable>(expression1: @autoclosure () -> T, expression2: @autoclosure () -> T, _ message: String = "", file: String = __FILE__, line: UInt = __LINE__) -> Void {
+public func XCTAssertNotEqual<T : Equatable>(expression1: @autoclosure () -> T, expression2: @autoclosure () -> T, _ message: String = "", file: String = __FILE__, line: UInt = __LINE__) -> Void {
   let assertionType = _XCTAssertionType.NotEqual
   
   // evaluate each expression exactly once
@@ -441,9 +441,9 @@ public func XCTAssertNotEqual<T: Equatable>(expression1: @autoclosure () -> T, e
 //  ContiguousArray<T>
 //  Slice<T>
 //  Array<T>
-//  Dictionary<T,U>
+//  Dictionary<T, U>
 
-public func XCTAssertNotEqual<T: Equatable>(expression1: @autoclosure () -> ContiguousArray<T>, expression2: @autoclosure () -> ContiguousArray<T>, _ message: String = "", file: String = __FILE__, line: UInt = __LINE__) -> Void {
+public func XCTAssertNotEqual<T : Equatable>(expression1: @autoclosure () -> ContiguousArray<T>, expression2: @autoclosure () -> ContiguousArray<T>, _ message: String = "", file: String = __FILE__, line: UInt = __LINE__) -> Void {
   let assertionType = _XCTAssertionType.NotEqual
   
   // evaluate each expression exactly once
@@ -478,7 +478,7 @@ public func XCTAssertNotEqual<T: Equatable>(expression1: @autoclosure () -> Cont
   }
 }
 
-public func XCTAssertNotEqual<T: Equatable>(expression1: @autoclosure () -> Slice<T>, expression2: @autoclosure () -> Slice<T>, _ message: String = "", file: String = __FILE__, line: UInt = __LINE__) -> Void {
+public func XCTAssertNotEqual<T : Equatable>(expression1: @autoclosure () -> Slice<T>, expression2: @autoclosure () -> Slice<T>, _ message: String = "", file: String = __FILE__, line: UInt = __LINE__) -> Void {
   let assertionType = _XCTAssertionType.NotEqual
   
   // evaluate each expression exactly once
@@ -513,12 +513,12 @@ public func XCTAssertNotEqual<T: Equatable>(expression1: @autoclosure () -> Slic
   }
 }
 
-public func XCTAssertNotEqual<T: Equatable>(expression1: @autoclosure () -> Array<T>, expression2: @autoclosure () -> Array<T>, _ message: String = "", file: String = __FILE__, line: UInt = __LINE__) -> Void {
+public func XCTAssertNotEqual<T : Equatable>(expression1: @autoclosure () -> [T], expression2: @autoclosure () -> [T], _ message: String = "", file: String = __FILE__, line: UInt = __LINE__) -> Void {
   let assertionType = _XCTAssertionType.NotEqual
   
   // evaluate each expression exactly once
-  var expressionValue1Optional: Array<T>?
-  var expressionValue2Optional: Array<T>?
+  var expressionValue1Optional: [T]?
+  var expressionValue2Optional: [T]?
   
   let result = _XCTRunThrowableBlock {
     expressionValue1Optional = expression1()
@@ -527,8 +527,8 @@ public func XCTAssertNotEqual<T: Equatable>(expression1: @autoclosure () -> Arra
   
   switch result {
   case .Success:
-    let expressionValue1: Array<T> = expressionValue1Optional!
-    let expressionValue2: Array<T> = expressionValue2Optional!
+    let expressionValue1: [T] = expressionValue1Optional!
+    let expressionValue2: [T] = expressionValue2Optional!
     
     if expressionValue1 == expressionValue2 {
       // TODO: @auto_string expression1
@@ -548,12 +548,12 @@ public func XCTAssertNotEqual<T: Equatable>(expression1: @autoclosure () -> Arra
   }
 }
 
-public func XCTAssertNotEqual<T, U: Equatable>(expression1: @autoclosure () -> Dictionary<T,U>, expression2: @autoclosure () -> Dictionary<T,U>, _ message: String = "", file: String = __FILE__, line: UInt = __LINE__) -> Void {
+public func XCTAssertNotEqual<T, U : Equatable>(expression1: @autoclosure () -> [T: U], expression2: @autoclosure () -> [T: U], _ message: String = "", file: String = __FILE__, line: UInt = __LINE__) -> Void {
   let assertionType = _XCTAssertionType.NotEqual
   
   // evaluate each expression exactly once
-  var expressionValue1Optional: Dictionary<T,U>?
-  var expressionValue2Optional: Dictionary<T,U>?
+  var expressionValue1Optional: [T: U]?
+  var expressionValue2Optional: [T: U]?
   
   let result = _XCTRunThrowableBlock {
     expressionValue1Optional = expression1()
@@ -562,8 +562,8 @@ public func XCTAssertNotEqual<T, U: Equatable>(expression1: @autoclosure () -> D
   
   switch result {
   case .Success:
-    let expressionValue1: Dictionary<T,U> = expressionValue1Optional!
-    let expressionValue2: Dictionary<T,U> = expressionValue2Optional!
+    let expressionValue1: [T: U] = expressionValue1Optional!
+    let expressionValue2: [T: U] = expressionValue2Optional!
     
     if expressionValue1 == expressionValue2 {
       // TODO: @auto_string expression1
diff --git a/stdlib/unittest/StdlibUnittest.swift.gyb b/stdlib/unittest/StdlibUnittest.swift.gyb
index 2a10e8b73f9..41ddfd8dc66 100644
--- a/stdlib/unittest/StdlibUnittest.swift.gyb
+++ b/stdlib/unittest/StdlibUnittest.swift.gyb
@@ -1174,7 +1174,7 @@ public func checkComparable<T : Comparable>(
 
 public func checkGenerator<
   G : GeneratorType, ${genericParam}
-  where ${Element} == G.Element, ${Element}: Equatable
+  where ${Element} == G.Element, ${Element} : Equatable
 >(
     expected: ${Expected},
     generator: G, stackTrace: SourceLocStack
@@ -1196,7 +1196,7 @@ public func checkGenerator<
 
 public func checkSequence<
   ${genericParam}, S : SequenceType
-    where S.Generator.Element == ${Element}, ${Element}: Equatable
+    where S.Generator.Element == ${Element}, ${Element} : Equatable
 >(
   expected: ${Expected},
   sequence: S, stackTrace: SourceLocStack
@@ -1208,7 +1208,7 @@ public func checkSequence<
 
 public func checkCollection<
     ${genericParam}, C : CollectionType
-  where C.Generator.Element == ${Element}, ${Element}: Equatable
+  where C.Generator.Element == ${Element}, ${Element} : Equatable
 >(
       expected: ${Expected},
       collection: C, stackTrace: SourceLocStack
@@ -1299,7 +1299,7 @@ public func checkRangeReplaceable<
   C: RangeReplaceableCollectionType,
   N: CollectionType
 where
-  C.Generator.Element: Equatable, C.Generator.Element == N.Generator.Element
+  C.Generator.Element : Equatable, C.Generator.Element == N.Generator.Element
 >(
   makeCollection: ()->C,
   makeNewValues: (Int)->N
@@ -1359,8 +1359,8 @@ where
 public func expectEqualSequence<
   Expected: SequenceType,
   Actual: SequenceType
-  where Expected.Generator.Element == Actual.Generator.Element, 
-     Expected.Generator.Element: Equatable
+  where Expected.Generator.Element == Actual.Generator.Element,
+     Expected.Generator.Element : Equatable
 >(
     expected: Expected, actual: Actual,
     stackTrace: SourceLocStack? = nil,