Tweak highlighting to be more consistent with previous.