Sure, I understand what you mean by "mess" just from looking at the code that surrounds your fixes.
I was just tripping over these variable names while trying to understand what is happening...
In general I support the idea of sharing a single client, so +1 from me.
(Looking forward to the larger rewrite though!)