0.16's IO API changes might be that cleanup.