Add some more typing.