First cut at fix typing.