Move more highlighting code from base to HighlighterPlugin