Add more type hints.