Remove ugly shadowing of Client.DEFAULT_ENCODING_PARAMETERS. fixes #1847

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Minor comment fix. refs #1847

Signed-off-by: Daira Hopwood <daira@jacaranda.org>