* lang_cpp/parsing/token_views_context.ml: merged more