Finally fix #3; speed up highlighter with a deque.