Properly wrap object, don't depend on DebuggerLib, other feedback incorporated (related to issue 6740)