Fixed: finishToken was both a function name and a function parameter name

Besides the fact it's confusing, it is bound to lead to errors at some point.

Also removed an extra parameter passed to readToken_lt_gt.