Tokens::toArray - enhance
FunctionDeclarationFixer - fix