Rewrite Parser::collect_tokens
#72393
+115
−75
Merged