Add a couple more type hints.