Add more straightforward type annotations.