Added a few more type annotations.