diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php
index c4215cfc163..783f520e962 100644
--- a/dictionaries/CallMap.php
+++ b/dictionaries/CallMap.php
@@ -3315,7 +3315,7 @@
 'getopt' => ['array<string,string|false|list<string|false>>|false', 'short_options'=>'string', 'long_options='=>'array', '&w_rest_index='=>'int'],
 'getprotobyname' => ['int|false', 'protocol'=>'string'],
 'getprotobynumber' => ['string', 'protocol'=>'int'],
-'getrandmax' => ['int'],
+'getrandmax' => ['int<1, max>'],
 'getrusage' => ['array', 'mode='=>'int'],
 'getservbyname' => ['int|false', 'service'=>'string', 'protocol'=>'string'],
 'getservbyport' => ['string|false', 'port'=>'int', 'protocol'=>'string'],
@@ -7646,7 +7646,7 @@
 'msql_query' => ['resource', 'query'=>'string', 'link_identifier='=>'?resource'],
 'msql_result' => ['string', 'result'=>'resource', 'row'=>'int', 'field='=>'mixed'],
 'msql_select_db' => ['bool', 'database_name'=>'string', 'link_identifier='=>'?resource'],
-'mt_getrandmax' => ['int'],
+'mt_getrandmax' => ['int<1, max>'],
 'mt_rand' => ['int', 'min'=>'int', 'max'=>'int'],
 'mt_rand\'1' => ['int'],
 'mt_srand' => ['void', 'seed='=>'?int', 'mode='=>'int'],
@@ -14165,7 +14165,7 @@
 'unlink' => ['bool', 'filename'=>'string', 'context='=>'resource'],
 'unpack' => ['array|false', 'format'=>'string', 'string'=>'string', 'offset='=>'int'],
 'unregister_tick_function' => ['void', 'callback'=>'callable'],
-'unserialize' => ['mixed', 'data'=>'string', 'options='=>'array{allowed_classes?:string[]|bool}'],
+'unserialize' => ['mixed', 'data'=>'string', 'options='=>'array{allowed_classes?:class-string[]|bool}'],
 'unset' => ['void', 'var='=>'mixed', '...args='=>'mixed'],
 'untaint' => ['bool', '&rw_string'=>'string', '&...rw_strings='=>'string'],
 'uopz_allow_exit' => ['void', 'allow'=>'bool'],
diff --git a/dictionaries/CallMap_historical.php b/dictionaries/CallMap_historical.php
index 6e16b365027..61e3db09d55 100644
--- a/dictionaries/CallMap_historical.php
+++ b/dictionaries/CallMap_historical.php
@@ -10679,7 +10679,7 @@
     'getopt' => ['array<string,string|false|list<string|false>>|false', 'short_options'=>'string', 'long_options='=>'array'],
     'getprotobyname' => ['int|false', 'protocol'=>'string'],
     'getprotobynumber' => ['string', 'protocol'=>'int'],
-    'getrandmax' => ['int'],
+    'getrandmax' => ['int<1, max>'],
     'getrusage' => ['array', 'mode='=>'int'],
     'getservbyname' => ['int|false', 'service'=>'string', 'protocol'=>'string'],
     'getservbyport' => ['string|false', 'port'=>'int', 'protocol'=>'string'],
@@ -12488,7 +12488,7 @@
     'msql_query' => ['resource', 'query'=>'string', 'link_identifier='=>'?resource'],
     'msql_result' => ['string', 'result'=>'resource', 'row'=>'int', 'field='=>'mixed'],
     'msql_select_db' => ['bool', 'database_name'=>'string', 'link_identifier='=>'?resource'],
-    'mt_getrandmax' => ['int'],
+    'mt_getrandmax' => ['int<1, max>'],
     'mt_rand' => ['int', 'min'=>'int', 'max'=>'int'],
     'mt_rand\'1' => ['int'],
     'mt_srand' => ['void', 'seed='=>'int', 'mode='=>'int'],
@@ -15197,7 +15197,7 @@
     'unlink' => ['bool', 'filename'=>'string', 'context='=>'resource'],
     'unpack' => ['array', 'format'=>'string', 'string'=>'string'],
     'unregister_tick_function' => ['void', 'callback'=>'callable'],
-    'unserialize' => ['mixed', 'data'=>'string', 'options='=>'array{allowed_classes?:string[]|bool}'],
+    'unserialize' => ['mixed', 'data'=>'string', 'options='=>'array{allowed_classes?:class-string[]|bool}'],
     'unset' => ['void', 'var='=>'mixed', '...args='=>'mixed'],
     'untaint' => ['bool', '&rw_string'=>'string', '&...rw_strings='=>'string'],
     'uopz_allow_exit' => ['void', 'allow'=>'bool'],