diff --git a/bin/gen_callmap.php b/bin/gen_callmap.php
index 3c25b015825..ae5084f2c27 100644
--- a/bin/gen_callmap.php
+++ b/bin/gen_callmap.php
@@ -101,7 +101,7 @@
     foreach ($prevData as $func => $descr) {
         if (!isset($nextData[$func])) {
             $diff['removed'][$func] = $descr;
-        } else if ($nextData[$func] !== $descr) {
+        } elseif ($nextData[$func] !== $descr) {
             $diff['changed'][$func] = [
                 'old' => $descr,
                 'new' => $nextData[$func],
diff --git a/dictionaries/CallMap_70.php b/dictionaries/CallMap_70.php
index 7390712b475..1eb5e659b8c 100644
--- a/dictionaries/CallMap_70.php
+++ b/dictionaries/CallMap_70.php
@@ -56149,7 +56149,7 @@
   ),
   'passthru' => 
   array (
-    0 => 'void',
+    0 => 'false|null',
     'command' => 'string',
     '&w_result_code=' => 'int',
   ),
diff --git a/dictionaries/CallMap_71.php b/dictionaries/CallMap_71.php
index 23e2a053ed8..82aadc271bd 100644
--- a/dictionaries/CallMap_71.php
+++ b/dictionaries/CallMap_71.php
@@ -56902,7 +56902,7 @@
   ),
   'passthru' => 
   array (
-    0 => 'void',
+    0 => 'false|null',
     'command' => 'string',
     '&w_result_code=' => 'int',
   ),
diff --git a/dictionaries/CallMap_72.php b/dictionaries/CallMap_72.php
index bb761c9a2a3..48acd5f7bb6 100644
--- a/dictionaries/CallMap_72.php
+++ b/dictionaries/CallMap_72.php
@@ -57538,7 +57538,7 @@
   ),
   'passthru' => 
   array (
-    0 => 'void',
+    0 => 'false|null',
     'command' => 'string',
     '&w_result_code=' => 'int',
   ),
diff --git a/dictionaries/CallMap_73.php b/dictionaries/CallMap_73.php
index 0587f8abb38..179bb534350 100644
--- a/dictionaries/CallMap_73.php
+++ b/dictionaries/CallMap_73.php
@@ -57746,7 +57746,7 @@
   ),
   'passthru' => 
   array (
-    0 => 'void',
+    0 => 'false|null',
     'command' => 'string',
     '&w_result_code=' => 'int',
   ),
diff --git a/dictionaries/CallMap_74.php b/dictionaries/CallMap_74.php
index d7f1bd7cd7a..49d79e67cfb 100644
--- a/dictionaries/CallMap_74.php
+++ b/dictionaries/CallMap_74.php
@@ -58003,7 +58003,7 @@
   ),
   'passthru' => 
   array (
-    0 => 'void',
+    0 => 'false|null',
     'command' => 'string',
     '&w_result_code=' => 'int',
   ),
diff --git a/dictionaries/CallMap_80.php b/dictionaries/CallMap_80.php
index 5ba59e8e2cd..41bed3131f5 100644
--- a/dictionaries/CallMap_80.php
+++ b/dictionaries/CallMap_80.php
@@ -57331,7 +57331,7 @@
   ),
   'passthru' => 
   array (
-    0 => 'void',
+    0 => 'false|null',
     'command' => 'string',
     '&w_result_code=' => 'int',
   ),
diff --git a/dictionaries/CallMap_81.php b/dictionaries/CallMap_81.php
index 39a6b29ebe1..f4d846e4732 100644
--- a/dictionaries/CallMap_81.php
+++ b/dictionaries/CallMap_81.php
@@ -23002,7 +23002,7 @@
   ),
   'fiber::getcurrent' => 
   array (
-    0 => 'null|self',
+    0 => 'Fiber|null',
   ),
   'fiber::getreturn' => 
   array (
@@ -50798,7 +50798,7 @@
   ),
   'multipleiterator::current' => 
   array (
-    0 => 'array<array-key, mixed>|false',
+    0 => 'array<array-key, mixed>',
   ),
   'multipleiterator::detachiterator' => 
   array (
@@ -56334,7 +56334,7 @@
   ),
   'passthru' => 
   array (
-    0 => 'void',
+    0 => 'false|null',
     'command' => 'string',
     '&w_result_code=' => 'int',
   ),
diff --git a/dictionaries/CallMap_82.php b/dictionaries/CallMap_82.php
index 09731d75c52..c7495db71da 100644
--- a/dictionaries/CallMap_82.php
+++ b/dictionaries/CallMap_82.php
@@ -23069,7 +23069,7 @@
   ),
   'fiber::getcurrent' => 
   array (
-    0 => 'null|self',
+    0 => 'Fiber|null',
   ),
   'fiber::getreturn' => 
   array (
@@ -50889,7 +50889,7 @@
   ),
   'multipleiterator::current' => 
   array (
-    0 => 'array<array-key, mixed>|false',
+    0 => 'array<array-key, mixed>',
   ),
   'multipleiterator::detachiterator' => 
   array (
@@ -56443,7 +56443,7 @@
   ),
   'passthru' => 
   array (
-    0 => 'void',
+    0 => 'false|null',
     'command' => 'string',
     '&w_result_code=' => 'int',
   ),
diff --git a/dictionaries/CallMap_83.php b/dictionaries/CallMap_83.php
index 7d1f7d441ac..32a73bda905 100644
--- a/dictionaries/CallMap_83.php
+++ b/dictionaries/CallMap_83.php
@@ -23681,7 +23681,7 @@
   ),
   'fiber::getcurrent' => 
   array (
-    0 => 'null|self',
+    0 => 'Fiber|null',
   ),
   'fiber::getreturn' => 
   array (
@@ -51550,7 +51550,7 @@
   ),
   'multipleiterator::current' => 
   array (
-    0 => 'array<array-key, mixed>|false',
+    0 => 'array<array-key, mixed>',
   ),
   'multipleiterator::detachiterator' => 
   array (
@@ -57092,7 +57092,7 @@
   ),
   'passthru' => 
   array (
-    0 => 'void',
+    0 => 'false|null',
     'command' => 'string',
     '&w_result_code=' => 'int',
   ),
diff --git a/dictionaries/CallMap_84.php b/dictionaries/CallMap_84.php
index 5572c758478..c966593a669 100644
--- a/dictionaries/CallMap_84.php
+++ b/dictionaries/CallMap_84.php
@@ -27224,7 +27224,7 @@
   ),
   'fiber::getcurrent' => 
   array (
-    0 => 'null|self',
+    0 => 'Fiber|null',
   ),
   'fiber::getreturn' => 
   array (
@@ -55170,7 +55170,7 @@
   ),
   'multipleiterator::current' => 
   array (
-    0 => 'array<array-key, mixed>|false',
+    0 => 'array<array-key, mixed>',
   ),
   'multipleiterator::detachiterator' => 
   array (
@@ -60717,7 +60717,7 @@
   ),
   'passthru' => 
   array (
-    0 => 'void',
+    0 => 'false|null',
     'command' => 'string',
     '&w_result_code=' => 'int',
   ),
diff --git a/dictionaries/override/CallMap.php b/dictionaries/override/CallMap.php
index 367ac8a72e3..f00108365d1 100644
--- a/dictionaries/override/CallMap.php
+++ b/dictionaries/override/CallMap.php
@@ -14458,10 +14458,6 @@
     0 => 'void',
     'callback' => 'callable',
   ),
-  'fiber::getcurrent' => 
-  array (
-    0 => 'null|self',
-  ),
   'fiber::getreturn' => 
   array (
     0 => 'mixed',
@@ -40405,7 +40401,7 @@
   ),
   'multipleiterator::current' => 
   array (
-    0 => 'array<array-key, mixed>|false',
+    0 => 'array<array-key, mixed>',
   ),
   'multipleiterator::detachiterator' => 
   array (
@@ -45864,7 +45860,7 @@
   ),
   'passthru' => 
   array (
-    0 => 'void',
+    0 => 'false|null',
     'command' => 'string',
     '&w_result_code=' => 'int',
   ),
diff --git a/dictionaries/override/CallMap_81_delta.php b/dictionaries/override/CallMap_81_delta.php
index 094a3b46b0b..07edfc19e24 100644
--- a/dictionaries/override/CallMap_81_delta.php
+++ b/dictionaries/override/CallMap_81_delta.php
@@ -31,10 +31,6 @@
       0 => 'void',
       'callback' => 'callable',
     ),
-    'fiber::getcurrent' => 
-    array (
-      0 => 'null|self',
-    ),
     'fiber::getreturn' => 
     array (
       0 => 'mixed',
@@ -3118,6 +3114,17 @@
         'encoding=' => 'null|string',
       ),
     ),
+    'multipleiterator::current' => 
+    array (
+      'old' => 
+      array (
+        0 => 'array<array-key, mixed>|false',
+      ),
+      'new' => 
+      array (
+        0 => 'array<array-key, mixed>',
+      ),
+    ),
     'mysqli::connect' => 
     array (
       'old' => 
diff --git a/docs/contributing/editing_callmaps.md b/docs/contributing/editing_callmaps.md
index 21eab25f65a..962a2a6739c 100644
--- a/docs/contributing/editing_callmaps.md
+++ b/docs/contributing/editing_callmaps.md
@@ -19,7 +19,8 @@ final callmaps in `dictionaries/CallMap_*`, which are the actual callmaps in use
 After editing an override callmap, run `bin/gen_callmap.php` to regenerate the final callmap file.
 
 To also regenerate the base callmaps, run `bin/gen_callmap.sh`: it will use the dockerfiles in `bin/` 
-to extract types from PHP and a set of extensions.
+to extract types from PHP and a set of extensions.  
+To add types from an extension to the callmap, edit all versions of the Dockerfiles.  
 
 ## Full callmap format