diff --git a/CoreStore.xcodeproj/project.pbxproj b/CoreStore.xcodeproj/project.pbxproj
index 0ee5eaa..576027c 100644
--- a/CoreStore.xcodeproj/project.pbxproj
+++ b/CoreStore.xcodeproj/project.pbxproj
@@ -302,7 +302,6 @@
 		B5D9E32F1CA2C317007A9D52 /* CoreStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 2F03A53519C5C6DA005002A5 /* CoreStore.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		B5D9E3431CA2C6C4007A9D52 /* GCDBlock.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D9E3371CA2C6BF007A9D52 /* GCDBlock.swift */; };
 		B5D9E3441CA2C6C4007A9D52 /* GCDGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D9E3381CA2C6BF007A9D52 /* GCDGroup.swift */; };
-		B5D9E3451CA2C6C4007A9D52 /* GCDKit.h in Headers */ = {isa = PBXBuildFile; fileRef = B5D9E3391CA2C6BF007A9D52 /* GCDKit.h */; };
 		B5D9E3461CA2C6C4007A9D52 /* GCDQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D9E33A1CA2C6BF007A9D52 /* GCDQueue.swift */; };
 		B5D9E3471CA2C6C4007A9D52 /* GCDSemaphore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D9E33B1CA2C6BF007A9D52 /* GCDSemaphore.swift */; };
 		B5D9E3481CA2C6C4007A9D52 /* GCDTimer.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D9E33C1CA2C6BF007A9D52 /* GCDTimer.swift */; };
@@ -449,7 +448,6 @@
 		B5D9E3341CA2C317007A9D52 /* CoreStore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CoreStore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		B5D9E3371CA2C6BF007A9D52 /* GCDBlock.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = GCDBlock.swift; path = Carthage/Checkouts/GCDKit/Sources/GCDBlock.swift; sourceTree = "<group>"; };
 		B5D9E3381CA2C6BF007A9D52 /* GCDGroup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = GCDGroup.swift; path = Carthage/Checkouts/GCDKit/Sources/GCDGroup.swift; sourceTree = "<group>"; };
-		B5D9E3391CA2C6BF007A9D52 /* GCDKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GCDKit.h; path = Carthage/Checkouts/GCDKit/Sources/GCDKit.h; sourceTree = "<group>"; };
 		B5D9E33A1CA2C6BF007A9D52 /* GCDQueue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = GCDQueue.swift; path = Carthage/Checkouts/GCDKit/Sources/GCDQueue.swift; sourceTree = "<group>"; };
 		B5D9E33B1CA2C6BF007A9D52 /* GCDSemaphore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = GCDSemaphore.swift; path = Carthage/Checkouts/GCDKit/Sources/GCDSemaphore.swift; sourceTree = "<group>"; };
 		B5D9E33C1CA2C6BF007A9D52 /* GCDTimer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = GCDTimer.swift; path = Carthage/Checkouts/GCDKit/Sources/GCDTimer.swift; sourceTree = "<group>"; };
@@ -707,7 +705,6 @@
 			children = (
 				B5D9E3371CA2C6BF007A9D52 /* GCDBlock.swift */,
 				B5D9E3381CA2C6BF007A9D52 /* GCDGroup.swift */,
-				B5D9E3391CA2C6BF007A9D52 /* GCDKit.h */,
 				B5D9E33A1CA2C6BF007A9D52 /* GCDQueue.swift */,
 				B5D9E33B1CA2C6BF007A9D52 /* GCDSemaphore.swift */,
 				B5D9E33C1CA2C6BF007A9D52 /* GCDTimer.swift */,
@@ -893,7 +890,6 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				B5D9E3451CA2C6C4007A9D52 /* GCDKit.h in Headers */,
 				B5D9E32F1CA2C317007A9D52 /* CoreStore.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/Sources/Internal/CoreStoreFetchedResultsController.swift b/Sources/Internal/CoreStoreFetchedResultsController.swift
index 926fc50..e471848 100644
--- a/Sources/Internal/CoreStoreFetchedResultsController.swift
+++ b/Sources/Internal/CoreStoreFetchedResultsController.swift
@@ -55,7 +55,7 @@ internal final class CoreStoreFetchedResultsController<T: NSManagedObject>: NSFe
         
         if let from = from {
             
-            self.reapplyAffectedStores = {
+            self.reapplyAffectedStores = { fetchRequest, context in
                 
                 return from.applyAffectedStoresForFetchedRequest(fetchRequest, context: context)
             }
@@ -67,7 +67,7 @@ internal final class CoreStoreFetchedResultsController<T: NSManagedObject>: NSFe
                 fatalError("Attempted to create an \(typeName(NSFetchedResultsController)) without a  From clause or an NSEntityDescription.")
             }
             
-            self.reapplyAffectedStores = {
+            self.reapplyAffectedStores = { fetchRequest, context in
                 
                 return from.applyAffectedStoresForFetchedRequest(fetchRequest, context: context)
             }
@@ -83,7 +83,7 @@ internal final class CoreStoreFetchedResultsController<T: NSManagedObject>: NSFe
     
     internal func performFetchFromSpecifiedStores() throws {
         
-        if !self.reapplyAffectedStores() {
+        if !self.reapplyAffectedStores(fetchRequest: self.fetchRequest, context: self.managedObjectContext) {
             
             CoreStore.log(
                 .Warning,
@@ -93,8 +93,13 @@ internal final class CoreStoreFetchedResultsController<T: NSManagedObject>: NSFe
         try self.performFetch()
     }
     
+    deinit {
+        
+        self.delegate = nil
+    }
+    
     
     // MARK: Private
     
-    private let reapplyAffectedStores: () -> Bool
+    private let reapplyAffectedStores: (fetchRequest: NSFetchRequest, context: NSManagedObjectContext) -> Bool
 }
diff --git a/Sources/Internal/NSManagedObjectContext+Transaction.swift b/Sources/Internal/NSManagedObjectContext+Transaction.swift
index eafcebc..96762fc 100644
--- a/Sources/Internal/NSManagedObjectContext+Transaction.swift
+++ b/Sources/Internal/NSManagedObjectContext+Transaction.swift
@@ -80,7 +80,7 @@ internal extension NSManagedObjectContext {
         
         var result = SaveResult(hasChanges: false)
         
-        self.performBlockAndWait { [unowned self] () -> Void in
+        self.performBlockAndWait {
             
             guard self.hasChanges else {
                 
@@ -124,7 +124,7 @@ internal extension NSManagedObjectContext {
     
     internal func saveAsynchronouslyWithCompletion(completion: ((result: SaveResult) -> Void) = { _ in }) {
         
-        self.performBlock { () -> Void in
+        self.performBlock {
             
             guard self.hasChanges else {
                 
diff --git a/Sources/Observing/ListMonitor.swift b/Sources/Observing/ListMonitor.swift
index 9ba11b8..dc72f43 100644
--- a/Sources/Observing/ListMonitor.swift
+++ b/Sources/Observing/ListMonitor.swift
@@ -891,6 +891,7 @@ public final class ListMonitor<T: NSManagedObject> {
                 object: self
             )
         }
+        self.fetchClauses = fetchClauses
         
         self.taskGroup.notify(.Main) { [weak self] () -> Void in
             
@@ -902,7 +903,7 @@ public final class ListMonitor<T: NSManagedObject> {
             self.fetchedResultsControllerDelegate.enabled = false
             
             let fetchRequest = self.fetchedResultsController.fetchRequest
-            for clause in fetchClauses {
+            for clause in self.fetchClauses {
                 
                 clause.applyToFetchRequest(fetchRequest)
             }
@@ -1019,6 +1020,7 @@ public final class ListMonitor<T: NSManagedObject> {
             self.sectionIndexTransformer = { $0 }
         }
         self.transactionQueue = transactionQueue
+        self.fetchClauses = fetchClauses
         
         fetchedResultsControllerDelegate.handler = self
         fetchedResultsControllerDelegate.fetchedResultsController = fetchedResultsController
@@ -1045,7 +1047,7 @@ public final class ListMonitor<T: NSManagedObject> {
                         
                         return
                 }
-                self.refetch(fetchClauses)
+                self.refetch(self.fetchClauses)
             }
         )
         
@@ -1068,7 +1070,7 @@ public final class ListMonitor<T: NSManagedObject> {
                     
                     if previousStores != currentStores {
                         
-                        self.refetch(fetchClauses)
+                        self.refetch(self.fetchClauses)
                     }
                 }
                 
@@ -1130,6 +1132,7 @@ public final class ListMonitor<T: NSManagedObject> {
     private var observerForDidChangePersistentStore: NotificationObserver!
     private let taskGroup = GCDGroup()
     private let transactionQueue: GCDQueue
+    private var fetchClauses: [FetchClause]
     
     private var willChangeListKey: Void?
     private var didChangeListKey: Void?