diff --git a/data/packages/expl3.json b/data/packages/expl3.json
index d6b859d55..1ea987157 100644
--- a/data/packages/expl3.json
+++ b/data/packages/expl3.json
@@ -1523,13 +1523,13 @@
       "name": "clist_gremove_all:NV"
     },
     {
-      "name": "clist_gremove_all:Nn"
+      "name": "clist_gremove_all:Ne"
     },
     {
-      "name": "clist_gremove_all:cV"
+      "name": "clist_gremove_all:Nn"
     },
     {
-      "name": "clist_gremove_all:Ne"
+      "name": "clist_gremove_all:cV"
     },
     {
       "name": "clist_gremove_all:ce"
@@ -2164,6 +2164,12 @@
     {
       "name": "coffin_ht:c"
     },
+    {
+      "name": "coffin_ht_plus_dp:N"
+    },
+    {
+      "name": "coffin_ht_plus_dp:c"
+    },
     {
       "name": "coffin_if_exist:NF"
     },
@@ -2542,9 +2548,45 @@
     {
       "name": "cs_if_eq:NNTF"
     },
+    {
+      "name": "cs_if_eq:NcF"
+    },
+    {
+      "name": "cs_if_eq:NcT"
+    },
+    {
+      "name": "cs_if_eq:NcTF"
+    },
+    {
+      "name": "cs_if_eq:cNF"
+    },
+    {
+      "name": "cs_if_eq:cNT"
+    },
+    {
+      "name": "cs_if_eq:cNTF"
+    },
+    {
+      "name": "cs_if_eq:ccF"
+    },
+    {
+      "name": "cs_if_eq:ccT"
+    },
+    {
+      "name": "cs_if_eq:ccTF"
+    },
     {
       "name": "cs_if_eq_p:NN"
     },
+    {
+      "name": "cs_if_eq_p:Nc"
+    },
+    {
+      "name": "cs_if_eq_p:cN"
+    },
+    {
+      "name": "cs_if_eq_p:cc"
+    },
     {
       "name": "cs_if_exist:NF"
     },
@@ -3007,9 +3049,15 @@
     {
       "name": "dim_gadd:cn"
     },
+    {
+      "name": "dim_gset:NV"
+    },
     {
       "name": "dim_gset:Nn"
     },
+    {
+      "name": "dim_gset:cV"
+    },
     {
       "name": "dim_gset:cn"
     },
@@ -3091,9 +3139,15 @@
     {
       "name": "dim_ratio:nn"
     },
+    {
+      "name": "dim_set:NV"
+    },
     {
       "name": "dim_set:Nn"
     },
+    {
+      "name": "dim_set:cV"
+    },
     {
       "name": "dim_set:cn"
     },
@@ -4021,9 +4075,15 @@
     {
       "name": "fp_gadd:cn"
     },
+    {
+      "name": "fp_gset:NV"
+    },
     {
       "name": "fp_gset:Nn"
     },
+    {
+      "name": "fp_gset:cV"
+    },
     {
       "name": "fp_gset:cn"
     },
@@ -4120,9 +4180,15 @@
     {
       "name": "fp_new_variable:n"
     },
+    {
+      "name": "fp_set:NV"
+    },
     {
       "name": "fp_set:Nn"
     },
+    {
+      "name": "fp_set:cV"
+    },
     {
       "name": "fp_set:cn"
     },
@@ -4750,9 +4816,15 @@
     {
       "name": "int_gincr:c"
     },
+    {
+      "name": "int_gset:NV"
+    },
     {
       "name": "int_gset:Nn"
     },
+    {
+      "name": "int_gset:cV"
+    },
     {
       "name": "int_gset:cn"
     },
@@ -4882,9 +4954,15 @@
     {
       "name": "int_rand:nn"
     },
+    {
+      "name": "int_set:NV"
+    },
     {
       "name": "int_set:Nn"
     },
+    {
+      "name": "int_set:cV"
+    },
     {
       "name": "int_set:cn"
     },
@@ -6370,9 +6448,15 @@
     {
       "name": "muskip_gadd:cn"
     },
+    {
+      "name": "muskip_gset:NV"
+    },
     {
       "name": "muskip_gset:Nn"
     },
+    {
+      "name": "muskip_gset:cV"
+    },
     {
       "name": "muskip_gset:cn"
     },
@@ -6445,9 +6529,15 @@
     {
       "name": "muskip_new:c"
     },
+    {
+      "name": "muskip_set:NV"
+    },
     {
       "name": "muskip_set:Nn"
     },
+    {
+      "name": "muskip_set:cV"
+    },
     {
       "name": "muskip_set:cn"
     },
@@ -9340,9 +9430,15 @@
     {
       "name": "skip_gadd:cn"
     },
+    {
+      "name": "skip_gset:NV"
+    },
     {
       "name": "skip_gset:Nn"
     },
+    {
+      "name": "skip_gset:cV"
+    },
     {
       "name": "skip_gset:cn"
     },
@@ -9448,9 +9544,15 @@
     {
       "name": "skip_new:c"
     },
+    {
+      "name": "skip_set:NV"
+    },
     {
       "name": "skip_set:Nn"
     },
+    {
+      "name": "skip_set:cV"
+    },
     {
       "name": "skip_set:cn"
     },
@@ -10090,6 +10192,9 @@
     {
       "name": "str_item:Nn"
     },
+    {
+      "name": "str_item:cn"
+    },
     {
       "name": "str_item:nn"
     },
diff --git a/dev/README.md b/dev/README.md
index 1a5248061..e041688a9 100644
--- a/dev/README.md
+++ b/dev/README.md
@@ -129,7 +129,7 @@ Completion files for classes are all prefixed by `class-`.
 
 ### latex3command.py
 
-This script generates `expl3.cwl` for LaTeX-3 from all `.dtx` files defined in `/opt/texlive/2024/texmf-dist/source/latex/l3kernel/`.
+This script generates `expl3.cwl` for LaTeX-3 from all `.dtx` files defined in `/opt/texlive/2024/texmf-dist/source/latex/l3kernel/`, which can be overwritten by setting environment variable `PATH_TO_DTX`.
 
 ## Grammar files