Rework some type annotations to help the type checker #2873

Job	Run time
Doc consistency and codespell	1m 11s
Caching on ubuntu-latest	12m 13s
Caching on macos-latest	16m 26s
Caching on windows-latest	13m 6s
	42m 56s

Provide feedback