This uses a new type of ExpressionFilter with op type "store", rather than setting a boolean flag on existing filter objects. Includes two test-cases showing examples where the old code failed.