Cleaned up the pollfd_mgr interface (which I'd forgotten to check in before anyway)