Simplify the extra::json:: syntax.
WIP tokenizer fixes.