Fixed some more type annotations.

Thanks to Michael Davidson for the fixes.