Improve heuristic standard detection: