Highlighting tweaks.