Make `client` more flexible.