Changes to make it work with new IO.

No match.