Fix some type annotations.