Token, Lexer: small refractorings.