Improved typing.