This patch attempts to clean up the horrible macro's in io.h,
and was done some time ago by Dave McCracken iirc.