Improve typing.