Highlighter refactoring.