More consistent client API.