Rename a few protected client methods.
Minor change in client options creation.
Remove "$that = $this;" kind of lines.

That trick to capture the current object instance within a closure is
no more needed since PHP 5.4.
Move StringBuffer class.
Use short array notation.