Merge "CLI: Remove calls to ast_cli_generator."