Replace $data pre filter with a short-circuit filter.