[FOLD] shared_handler tidying
[FOLD] more shared_handler tidying
Use make_wrapped in MultiSocket