Improved conditional highlighting.