Adapt to use new clustering API.