Make addSpan an instance method of TokenVisitor.
#1367
+23
−28
Merged