More consistent formatting of requests in Client

To help the OCD in me, I've wrapped all requests with brackets (most already where) and made options merging more consistent.