Deprecated per-client options.

Fixes #281.

_**NOTE:** Will need to be rebased after merging PR #304, #306._