I was torn between re-use and clean delineation.  I'll put client back into deployments.