Fixups make the test suite almost pass (except *io-39.17)