fix contains_aggregate to work with non F() objects
All tests now pass after removing SQLEvaluator