Improve type hints.