Adapt client to new API stuff in #pants.