Small tweaks for highlighting.