This cleans up the filter interface so that it always uses a feature and
never a context.