diff --git a/command-signatures/json/code-insiders.json b/command-signatures/json/code-insiders.json
index 24a53007..ef2ad8cf 100644
--- a/command-signatures/json/code-insiders.json
+++ b/command-signatures/json/code-insiders.json
@@ -14,17 +14,7 @@
                 "-d",
                 "--diff"
             ],
-            "description": "Compare two files with each other",
-            "args": [
-                {
-                    "name": "file",
-                    "template": "filepaths"
-                },
-                {
-                    "name": "file",
-                    "template": "filepaths"
-                }
-            ]
+            "description": "Compare two files with each other"
         },
         {
             "name": [
diff --git a/command-signatures/json/code.json b/command-signatures/json/code.json
index 783fe5e0..587246ac 100644
--- a/command-signatures/json/code.json
+++ b/command-signatures/json/code.json
@@ -15,17 +15,7 @@
                 "-d",
                 "--diff"
             ],
-            "description": "Compare two files with each other",
-            "args": [
-                {
-                    "name": "file",
-                    "template": "filepaths"
-                },
-                {
-                    "name": "file",
-                    "template": "filepaths"
-                }
-            ]
+            "description": "Compare two files with each other"
         },
         {
             "name": [
diff --git a/command-signatures/json/git.json b/command-signatures/json/git.json
index 991e6091..9758411b 100644
--- a/command-signatures/json/git.json
+++ b/command-signatures/json/git.json
@@ -6788,27 +6788,11 @@
                         "-m",
                         "--move"
                     ],
-                    "description": "Move/rename a branch and its reflog",
-                    "args": [
-                        {
-                            "generatorName": "local_branches"
-                        },
-                        {
-                            "generatorName": "local_branches"
-                        }
-                    ]
+                    "description": "Move/rename a branch and its reflog"
                 },
                 {
                     "name": "-M",
-                    "description": "Move/rename a branch, even if target exists",
-                    "args": [
-                        {
-                            "generatorName": "local_branches"
-                        },
-                        {
-                            "generatorName": "local_branches"
-                        }
-                    ]
+                    "description": "Move/rename a branch, even if target exists"
                 },
                 {
                     "name": [
@@ -6957,18 +6941,7 @@
                     "exclusiveOn": [
                         "--no-track"
                     ],
-                    "description": "When creating a new branch, set up 'upstream' configuration",
-                    "args": [
-                        {
-                            "name": "branch",
-                            "generatorName": "local_branches"
-                        },
-                        {
-                            "name": "start point",
-                            "isOptional": true,
-                            "generatorName": "commits"
-                        }
-                    ]
+                    "description": "When creating a new branch, set up 'upstream' configuration"
                 },
                 {
                     "name": "--no-track",
@@ -6976,16 +6949,7 @@
                         "--track",
                         "-t"
                     ],
-                    "description": "Do not set up 'upstream' configuration, even if the branch.autoSetupMerge configuration variable is true",
-                    "args": [
-                        {
-                            "generatorName": "local_branches"
-                        },
-                        {
-                            "isOptional": true,
-                            "generatorName": "local_branches"
-                        }
-                    ]
+                    "description": "Do not set up 'upstream' configuration, even if the branch.autoSetupMerge configuration variable is true"
                 },
                 {
                     "name": [
@@ -7049,7 +7013,14 @@
                         "--color"
                     ]
                 }
-            ]
+            ],
+            "args": {
+                "name": "branch-name",
+                "description": "Branch operand(s): <branch-name> [<start-point>] when creating, [<old-branch>] <new-branch> with -m/-M/-c/-C, <branch-name>... with -d/-D, or [<pattern>...] with --list",
+                "isOptional": true,
+                "isVariadic": true,
+                "generatorName": "local_branches"
+            }
         },
         {
             "name": "checkout",
@@ -8336,16 +8307,9 @@
                         "--create"
                     ],
                     "description": "Create a new branch named <new-branch> starting at <start-point> before switching to the branch",
-                    "args": [
-                        {
-                            "name": "new branch"
-                        },
-                        {
-                            "name": "start point",
-                            "isOptional": true,
-                            "generatorName": "commits"
-                        }
-                    ]
+                    "args": {
+                        "name": "new branch"
+                    }
                 },
                 {
                     "name": [
@@ -8353,16 +8317,9 @@
                         "--force-create"
                     ],
                     "description": "Similar to --create except that if <new-branch> already exists it will be reset to <start-point>",
-                    "args": [
-                        {
-                            "name": "new branch"
-                        },
-                        {
-                            "name": "start point",
-                            "isOptional": true,
-                            "generatorName": "commits"
-                        }
-                    ]
+                    "args": {
+                        "name": "new branch"
+                    }
                 },
                 {
                     "name": [
@@ -8435,18 +8392,7 @@
                     "exclusiveOn": [
                         "--no-track"
                     ],
-                    "description": "When creating a new branch, set up 'upstream' configuration",
-                    "args": [
-                        {
-                            "name": "branch",
-                            "generatorName": "local_branches"
-                        },
-                        {
-                            "name": "start point",
-                            "isOptional": true,
-                            "generatorName": "commits"
-                        }
-                    ]
+                    "description": "When creating a new branch, set up 'upstream' configuration"
                 },
                 {
                     "name": "--no-track",
@@ -8454,16 +8400,7 @@
                         "--track",
                         "-t"
                     ],
-                    "description": "Do not set up 'upstream' configuration, even if the branch.autoSetupMerge configuration variable is true",
-                    "args": [
-                        {
-                            "generatorName": "local_branches"
-                        },
-                        {
-                            "isOptional": true,
-                            "generatorName": "local_branches"
-                        }
-                    ]
+                    "description": "Do not set up 'upstream' configuration, even if the branch.autoSetupMerge configuration variable is true"
                 },
                 {
                     "name": "--orphan",
diff --git a/command-signatures/json/hub.json b/command-signatures/json/hub.json
index 7c3edcd4..bc4b1ce0 100644
--- a/command-signatures/json/hub.json
+++ b/command-signatures/json/hub.json
@@ -6401,39 +6401,11 @@
                         "-m",
                         "--move"
                     ],
-                    "description": "Move/rename a branch and its reflog",
-                    "args": [
-                        {
-                            "generators": {
-                                "script": "git --no-optional-locks branch --no-color --sort=-committerdate",
-                                "postProcess": "_NuFrRa_t=>{let{insertWithoutRemotes:i=!1}=o,r=l(t);return r.startsWith(\"fatal:\")?[]:r.split(`\n`).filter(a=>!a.trim().startsWith(\"HEAD\")).map(a=>{let s=a.trim(),n=a.match(/\\S+/g);if(n.length>1){if(n[0]===\"*\")return a.includes(\"HEAD detached\")?null:{name:a.replace(\"*\",\"\").trim(),description:\"Current branch\",priority:100,icon:\"\\u2B50\\uFE0F\"};n[0]===\"+\"&&(s=a.replace(\"+\",\"\").trim())}let c=\"Branch\";return i&&s.startsWith(\"remotes/\")&&(s=s.slice(s.indexOf(\"/\",8)+1),c=\"Remote branch\"),{name:s,description:c,icon:\"fig://icon?type=git\",priority:75}})}"
-                            }
-                        },
-                        {
-                            "generators": {
-                                "script": "git --no-optional-locks branch --no-color --sort=-committerdate",
-                                "postProcess": "_NuFrRa_t=>{let{insertWithoutRemotes:i=!1}=o,r=l(t);return r.startsWith(\"fatal:\")?[]:r.split(`\n`).filter(a=>!a.trim().startsWith(\"HEAD\")).map(a=>{let s=a.trim(),n=a.match(/\\S+/g);if(n.length>1){if(n[0]===\"*\")return a.includes(\"HEAD detached\")?null:{name:a.replace(\"*\",\"\").trim(),description:\"Current branch\",priority:100,icon:\"\\u2B50\\uFE0F\"};n[0]===\"+\"&&(s=a.replace(\"+\",\"\").trim())}let c=\"Branch\";return i&&s.startsWith(\"remotes/\")&&(s=s.slice(s.indexOf(\"/\",8)+1),c=\"Remote branch\"),{name:s,description:c,icon:\"fig://icon?type=git\",priority:75}})}"
-                            }
-                        }
-                    ]
+                    "description": "Move/rename a branch and its reflog"
                 },
                 {
                     "name": "-M",
-                    "description": "Move/rename a branch, even if target exists",
-                    "args": [
-                        {
-                            "generators": {
-                                "script": "git --no-optional-locks branch --no-color --sort=-committerdate",
-                                "postProcess": "_NuFrRa_t=>{let{insertWithoutRemotes:i=!1}=o,r=l(t);return r.startsWith(\"fatal:\")?[]:r.split(`\n`).filter(a=>!a.trim().startsWith(\"HEAD\")).map(a=>{let s=a.trim(),n=a.match(/\\S+/g);if(n.length>1){if(n[0]===\"*\")return a.includes(\"HEAD detached\")?null:{name:a.replace(\"*\",\"\").trim(),description:\"Current branch\",priority:100,icon:\"\\u2B50\\uFE0F\"};n[0]===\"+\"&&(s=a.replace(\"+\",\"\").trim())}let c=\"Branch\";return i&&s.startsWith(\"remotes/\")&&(s=s.slice(s.indexOf(\"/\",8)+1),c=\"Remote branch\"),{name:s,description:c,icon:\"fig://icon?type=git\",priority:75}})}"
-                            }
-                        },
-                        {
-                            "generators": {
-                                "script": "git --no-optional-locks branch --no-color --sort=-committerdate",
-                                "postProcess": "_NuFrRa_t=>{let{insertWithoutRemotes:i=!1}=o,r=l(t);return r.startsWith(\"fatal:\")?[]:r.split(`\n`).filter(a=>!a.trim().startsWith(\"HEAD\")).map(a=>{let s=a.trim(),n=a.match(/\\S+/g);if(n.length>1){if(n[0]===\"*\")return a.includes(\"HEAD detached\")?null:{name:a.replace(\"*\",\"\").trim(),description:\"Current branch\",priority:100,icon:\"\\u2B50\\uFE0F\"};n[0]===\"+\"&&(s=a.replace(\"+\",\"\").trim())}let c=\"Branch\";return i&&s.startsWith(\"remotes/\")&&(s=s.slice(s.indexOf(\"/\",8)+1),c=\"Remote branch\"),{name:s,description:c,icon:\"fig://icon?type=git\",priority:75}})}"
-                            }
-                        }
-                    ]
+                    "description": "Move/rename a branch, even if target exists"
                 },
                 {
                     "name": [
@@ -6585,24 +6557,7 @@
                     "exclusiveOn": [
                         "--no-track"
                     ],
-                    "description": "When creating a new branch, set up 'upstream' configuration",
-                    "args": [
-                        {
-                            "name": "branch",
-                            "generators": {
-                                "script": "git --no-optional-locks branch --no-color --sort=-committerdate",
-                                "postProcess": "_NuFrRa_t=>{let{insertWithoutRemotes:i=!1}=o,r=l(t);return r.startsWith(\"fatal:\")?[]:r.split(`\n`).filter(a=>!a.trim().startsWith(\"HEAD\")).map(a=>{let s=a.trim(),n=a.match(/\\S+/g);if(n.length>1){if(n[0]===\"*\")return a.includes(\"HEAD detached\")?null:{name:a.replace(\"*\",\"\").trim(),description:\"Current branch\",priority:100,icon:\"\\u2B50\\uFE0F\"};n[0]===\"+\"&&(s=a.replace(\"+\",\"\").trim())}let c=\"Branch\";return i&&s.startsWith(\"remotes/\")&&(s=s.slice(s.indexOf(\"/\",8)+1),c=\"Remote branch\"),{name:s,description:c,icon:\"fig://icon?type=git\",priority:75}})}"
-                            }
-                        },
-                        {
-                            "name": "start point",
-                            "isOptional": true,
-                            "generators": {
-                                "script": "git --no-optional-locks log --oneline",
-                                "postProcess": "function(o){let t=l(o);return t.startsWith(\"fatal:\")?[]:t.split(`\n`).map(i=>({name:i.substring(0,7),icon:\"fig://icon?type=node\",description:i.substring(7)}))}"
-                            }
-                        }
-                    ]
+                    "description": "When creating a new branch, set up 'upstream' configuration"
                 },
                 {
                     "name": "--no-track",
@@ -6610,22 +6565,7 @@
                         "--track",
                         "-t"
                     ],
-                    "description": "Do not set up 'upstream' configuration, even if the branch.autoSetupMerge configuration variable is true",
-                    "args": [
-                        {
-                            "generators": {
-                                "script": "git --no-optional-locks branch --no-color --sort=-committerdate",
-                                "postProcess": "_NuFrRa_t=>{let{insertWithoutRemotes:i=!1}=o,r=l(t);return r.startsWith(\"fatal:\")?[]:r.split(`\n`).filter(a=>!a.trim().startsWith(\"HEAD\")).map(a=>{let s=a.trim(),n=a.match(/\\S+/g);if(n.length>1){if(n[0]===\"*\")return a.includes(\"HEAD detached\")?null:{name:a.replace(\"*\",\"\").trim(),description:\"Current branch\",priority:100,icon:\"\\u2B50\\uFE0F\"};n[0]===\"+\"&&(s=a.replace(\"+\",\"\").trim())}let c=\"Branch\";return i&&s.startsWith(\"remotes/\")&&(s=s.slice(s.indexOf(\"/\",8)+1),c=\"Remote branch\"),{name:s,description:c,icon:\"fig://icon?type=git\",priority:75}})}"
-                            }
-                        },
-                        {
-                            "isOptional": true,
-                            "generators": {
-                                "script": "git --no-optional-locks branch --no-color --sort=-committerdate",
-                                "postProcess": "_NuFrRa_t=>{let{insertWithoutRemotes:i=!1}=o,r=l(t);return r.startsWith(\"fatal:\")?[]:r.split(`\n`).filter(a=>!a.trim().startsWith(\"HEAD\")).map(a=>{let s=a.trim(),n=a.match(/\\S+/g);if(n.length>1){if(n[0]===\"*\")return a.includes(\"HEAD detached\")?null:{name:a.replace(\"*\",\"\").trim(),description:\"Current branch\",priority:100,icon:\"\\u2B50\\uFE0F\"};n[0]===\"+\"&&(s=a.replace(\"+\",\"\").trim())}let c=\"Branch\";return i&&s.startsWith(\"remotes/\")&&(s=s.slice(s.indexOf(\"/\",8)+1),c=\"Remote branch\"),{name:s,description:c,icon:\"fig://icon?type=git\",priority:75}})}"
-                            }
-                        }
-                    ]
+                    "description": "Do not set up 'upstream' configuration, even if the branch.autoSetupMerge configuration variable is true"
                 },
                 {
                     "name": [
@@ -6701,7 +6641,13 @@
                         "--color"
                     ]
                 }
-            ]
+            ],
+            "args": {
+                "name": "branch-name",
+                "description": "Branch operand(s): <branch-name> [<start-point>] when creating, [<old-branch>] <new-branch> with -m/-M/-c/-C, <branch-name>... with -d/-D, or [<pattern>...] with --list",
+                "isOptional": true,
+                "isVariadic": true
+            }
         },
         {
             "name": "checkout",
@@ -8007,19 +7953,9 @@
                         "--create"
                     ],
                     "description": "Create a new branch named <new-branch> starting at <start-point> before switching to the branch",
-                    "args": [
-                        {
-                            "name": "new branch"
-                        },
-                        {
-                            "name": "start point",
-                            "isOptional": true,
-                            "generators": {
-                                "script": "git --no-optional-locks log --oneline",
-                                "postProcess": "function(o){let t=l(o);return t.startsWith(\"fatal:\")?[]:t.split(`\n`).map(i=>({name:i.substring(0,7),icon:\"fig://icon?type=node\",description:i.substring(7)}))}"
-                            }
-                        }
-                    ]
+                    "args": {
+                        "name": "new branch"
+                    }
                 },
                 {
                     "name": [
@@ -8027,19 +7963,9 @@
                         "--force-create"
                     ],
                     "description": "Similar to --create except that if <new-branch> already exists it will be reset to <start-point>",
-                    "args": [
-                        {
-                            "name": "new branch"
-                        },
-                        {
-                            "name": "start point",
-                            "isOptional": true,
-                            "generators": {
-                                "script": "git --no-optional-locks log --oneline",
-                                "postProcess": "function(o){let t=l(o);return t.startsWith(\"fatal:\")?[]:t.split(`\n`).map(i=>({name:i.substring(0,7),icon:\"fig://icon?type=node\",description:i.substring(7)}))}"
-                            }
-                        }
-                    ]
+                    "args": {
+                        "name": "new branch"
+                    }
                 },
                 {
                     "name": [
@@ -8111,24 +8037,7 @@
                     "exclusiveOn": [
                         "--no-track"
                     ],
-                    "description": "When creating a new branch, set up 'upstream' configuration",
-                    "args": [
-                        {
-                            "name": "branch",
-                            "generators": {
-                                "script": "git --no-optional-locks branch --no-color --sort=-committerdate",
-                                "postProcess": "_NuFrRa_t=>{let{insertWithoutRemotes:i=!1}=o,r=l(t);return r.startsWith(\"fatal:\")?[]:r.split(`\n`).filter(a=>!a.trim().startsWith(\"HEAD\")).map(a=>{let s=a.trim(),n=a.match(/\\S+/g);if(n.length>1){if(n[0]===\"*\")return a.includes(\"HEAD detached\")?null:{name:a.replace(\"*\",\"\").trim(),description:\"Current branch\",priority:100,icon:\"\\u2B50\\uFE0F\"};n[0]===\"+\"&&(s=a.replace(\"+\",\"\").trim())}let c=\"Branch\";return i&&s.startsWith(\"remotes/\")&&(s=s.slice(s.indexOf(\"/\",8)+1),c=\"Remote branch\"),{name:s,description:c,icon:\"fig://icon?type=git\",priority:75}})}"
-                            }
-                        },
-                        {
-                            "name": "start point",
-                            "isOptional": true,
-                            "generators": {
-                                "script": "git --no-optional-locks log --oneline",
-                                "postProcess": "function(o){let t=l(o);return t.startsWith(\"fatal:\")?[]:t.split(`\n`).map(i=>({name:i.substring(0,7),icon:\"fig://icon?type=node\",description:i.substring(7)}))}"
-                            }
-                        }
-                    ]
+                    "description": "When creating a new branch, set up 'upstream' configuration"
                 },
                 {
                     "name": "--no-track",
@@ -8136,22 +8045,7 @@
                         "--track",
                         "-t"
                     ],
-                    "description": "Do not set up 'upstream' configuration, even if the branch.autoSetupMerge configuration variable is true",
-                    "args": [
-                        {
-                            "generators": {
-                                "script": "git --no-optional-locks branch --no-color --sort=-committerdate",
-                                "postProcess": "_NuFrRa_t=>{let{insertWithoutRemotes:i=!1}=o,r=l(t);return r.startsWith(\"fatal:\")?[]:r.split(`\n`).filter(a=>!a.trim().startsWith(\"HEAD\")).map(a=>{let s=a.trim(),n=a.match(/\\S+/g);if(n.length>1){if(n[0]===\"*\")return a.includes(\"HEAD detached\")?null:{name:a.replace(\"*\",\"\").trim(),description:\"Current branch\",priority:100,icon:\"\\u2B50\\uFE0F\"};n[0]===\"+\"&&(s=a.replace(\"+\",\"\").trim())}let c=\"Branch\";return i&&s.startsWith(\"remotes/\")&&(s=s.slice(s.indexOf(\"/\",8)+1),c=\"Remote branch\"),{name:s,description:c,icon:\"fig://icon?type=git\",priority:75}})}"
-                            }
-                        },
-                        {
-                            "isOptional": true,
-                            "generators": {
-                                "script": "git --no-optional-locks branch --no-color --sort=-committerdate",
-                                "postProcess": "_NuFrRa_t=>{let{insertWithoutRemotes:i=!1}=o,r=l(t);return r.startsWith(\"fatal:\")?[]:r.split(`\n`).filter(a=>!a.trim().startsWith(\"HEAD\")).map(a=>{let s=a.trim(),n=a.match(/\\S+/g);if(n.length>1){if(n[0]===\"*\")return a.includes(\"HEAD detached\")?null:{name:a.replace(\"*\",\"\").trim(),description:\"Current branch\",priority:100,icon:\"\\u2B50\\uFE0F\"};n[0]===\"+\"&&(s=a.replace(\"+\",\"\").trim())}let c=\"Branch\";return i&&s.startsWith(\"remotes/\")&&(s=s.slice(s.indexOf(\"/\",8)+1),c=\"Remote branch\"),{name:s,description:c,icon:\"fig://icon?type=git\",priority:75}})}"
-                            }
-                        }
-                    ]
+                    "description": "Do not set up 'upstream' configuration, even if the branch.autoSetupMerge configuration variable is true"
                 },
                 {
                     "name": "--orphan",