Fixing wrong return types reported by return type hints (2) [ci skip]