That would probably be preferable but I think would take someone more versed in the codebase than myself. I don't have the epoll requirements to test that codepath and am just not familiar enough with the inner workings of Icarus to start changing those things.

I do agree that would be cleaner though.