Flagged by pytype when a later changeset is applied moving typing comment to annotation.

We fix this ahead of the annotation change to make sure pytype remains happy
after the change.

We have to do fairly crazy dance for pytype to be happy. This probably comes
from the fact IOError.filename probably claims to be `str` while it is actually
`bytes` if the filename raising that `IOError` is bytes.

At the same time, `IOError.strerror` is consistently `str` and should be passed
as `str` everywhere.