Fix up highlighting.