We should nil out super first *always*

Author: Rui Peres

AsyncDisplayKit/ASTableView.mm

@@ -288,13 +288,16 @@ - (void)setAsyncDataSource:(id<ASTableViewDataSource>)asyncDataSource
   // the (common) case of nilling the asyncDataSource in the ViewController's dealloc. In this case our _asyncDataSource
   // will return as nil (ARC magic) even though the _proxyDataSource still exists. It's really important to nil out
   // _proxyDataSource.target in this case because calls to _ASTableViewProxy will start failing and cause crashes.
+  
+  super.dataSource = nil;
 
   if (asyncDataSource == nil) {
-    _proxyDataSource.target = nil;
     _asyncDataSource = nil;
+    _proxyDataSource = nil;
   } else {
-    _proxyDataSource.target = asyncDataSource;
     _asyncDataSource = asyncDataSource;
+    _proxyDataSource = [[_ASTableViewProxy alloc] initWithTarget:_asyncDataSource interceptor:self];
+    super.dataSource = (id<UITableViewDataSource>)_proxyDataSource;
   }
 }
 
@@ -305,15 +308,16 @@ - (void)setAsyncDelegate:(id<ASTableViewDelegate>)asyncDelegate
   // will return as nil (ARC magic) even though the _proxyDelegate still exists. It's really important to nil out
   // _proxyDelegate.target in this case because calls to _ASTableViewProxy will start failing and cause crashes.
 
+  super.delegate = nil;
+
   if (asyncDelegate == nil) {
     // order is important here, the delegate must be callable while nilling super.delegate to avoid random crashes
     // in UIScrollViewAccessibility.
-    super.delegate = nil;
     _asyncDelegate = nil;
-    _proxyDelegate = nil; 
+    _proxyDelegate = nil;
   } else {
-    _proxyDelegate = [[_ASTableViewProxy alloc] initWithTarget:asyncDelegate interceptor:self];;
     _asyncDelegate = asyncDelegate;
+    _proxyDelegate = [[_ASTableViewProxy alloc] initWithTarget:asyncDelegate interceptor:self];
     super.delegate = (id<UITableViewDelegate>)_proxyDelegate;
   }
 }