Some rewrites due do AnyEventX::CondVar changes