Fix multi-line annotation of tokens