[4.2] Some substitutions of typehints (helpers.php)