- Added some more missing type annotations.