Use of boost::make_shared in wcontrol

Second pass.