Restore highlighting of pivotal control sequences
Simplify getSpans logic