Move to broccoli-funnel.

Funnel is much faster, and IMHO has a saner API.