Improved highlighting heuristic.