More highlighting improvements.