Changed DesignDoc implementation to mirror cb-client's closer.  Fixed bug around wrapper_class.