Adapt to new API in util_circle.