diff --git a/Sources/Apollo/Collections.swift b/Sources/Apollo/Collections.swift
index 18fbe7887c..f9282fba75 100644
--- a/Sources/Apollo/Collections.swift
+++ b/Sources/Apollo/Collections.swift
@@ -1,17 +1,3 @@
-extension Dictionary {
-  subscript(key: Key, withDefault value: @autoclosure () -> Value) -> Value {
-    mutating get {
-      if self[key] == nil {
-        self[key] = value()
-      }
-      return self[key]!
-    }
-    set {
-      self[key] = newValue
-    }
-  }
-}
-
 public extension Dictionary {
   static func += (lhs: inout Dictionary, rhs: Dictionary) {
     #if swift(>=3.2)
@@ -58,7 +44,7 @@ extension GroupedSequence: Sequence {
 struct GroupedSequenceIterator<Key: Equatable, Value>: IteratorProtocol {
   private var base: GroupedSequence<Key, Value>
   
-  private var keyIterator: EnumeratedIterator<IndexingIterator<Array<Key>>>
+  private var keyIterator: EnumeratedSequence<Array<Key>>.Iterator
   
   init(base: GroupedSequence<Key, Value>) {
     self.base = base