Updating: tidying-up contrib/libevent