Plumbed filters into bindings and reorganized code.