Formatting.
Further improved heuristics; big test down below 2s.