Generators: update a few more type declarations #1131

Job	Run time
QuickTest: PHP 7.2 (Win)	1m 3s
QuickTest: PHP 8.1 (Linux ARM)	52s
QuickTest: PHP latest (Win)	50s
QuickTest: PHP 7.2 (Linux ARM)	1m 45s
QuickTest: PHP 8.1 (Win)	55s
QuickTest: PHP latest (Linux ARM)	53s
	6m 18s

Provide feedback