Changes for highlight-symbol mode.