clean up code to let IO handler tests pass
Authored by: gerddie 2010-01-20
Parent: [r1466]
Child: [r1468]