Updated for v.0.22 of the highlighter.