Added additional arities for make-client.