Tightened up WithFilterImpl