[FOLD] make_wrapped improvement
[FOLD] HandshakeDetector better use of make_Wrapped