Completer and Highlighter Enhancements