Improve clustering heuristic.