Updated to work with latest io.c changes.