Rather that have TokenSink as a field in Tokenizer, pass it around as parameter.
temporary commit