Get I/O definedness handling closer to right.