jshint fixes
simplify and fix argument preparation
replace closure-this with `_.bind`
Merge branch 'wait-for-filters'