Neon, Latte: refactoring to not use internal Tokenizer properites (little bird told me that they will not live long...)