Adapt to latest libcommuni 3.x changes