Roll forward commits r33138, r33135, and r33134.

pkg/barback/lib/src/phase_forwarder.dart

Index: pkg/barback/lib/src/phase_forwarder.dart
diff --git a/pkg/barback/lib/src/phase_forwarder.dart b/pkg/barback/lib/src/phase_forwarder.dart
index 1e0d3fead9d8d1f5a345c10fdf4d3844974626c5..1d5682d9f3542f09a2f6695808c8767a6c51621c 100644
--- a/pkg/barback/lib/src/phase_forwarder.dart
+++ b/pkg/barback/lib/src/phase_forwarder.dart
@@ -7,6 +7,7 @@ library barback.phase_forwarder;
 import 'dart:async';
 
 import 'asset_node.dart';
+import 'asset_node_set.dart';
 
 /// A class that takes care of forwarding assets within a phase.
 ///
@@ -40,7 +41,7 @@ class PhaseForwarder {
   int _numChannels;
 
   /// The intermediate forwarded assets.
-  final _intermediateAssets = new Set<AssetNode>();
+  final _intermediateAssets = new AssetNodeSet();
 
   /// The final forwarded asset.
   ///
@@ -68,11 +69,7 @@ class PhaseForwarder {
     }
 
     _intermediateAssets.add(asset);
-
-    asset.onStateChange.listen((state) {
-      if (state.isRemoved) _intermediateAssets.remove(asset);
-      _adjustOutput();
-    });
+    asset.onStateChange.listen((_) => _adjustOutput());
 
     _adjustOutput();
   }