More type hint improvements.