More heuristics for Combiner-AA. Still catches all important cases, but