Adapt bunch of stuff to broccoli-dep-filter.