Handle pathological contrast/aggregate cases
Merge pull request #324 from ChrisBeaumont/fast_limits_fix

Aggregation corner cases