Tweak highlighting to be more consistent.