Update tokenizer arguments

[ghost]

In tokenizer and its methods, make the first argument a) universal between the methods, and b) less generic than "x".