Much better expand-to-matching behavior.