More fio.h cleanups