Update presort heuristics for less insane orderings
Update presort heuristics for less insane orderings

shamrin/Eve,nmsmith/Eve,witheve/Eve,witheve/Eve,nmsmith/Eve,witheve/Eve,nmsmith/Eve,shamrin/Eve,shamrin/Eve