Wolfolo Codechange: refactor of ::Unpack() method to be less confusing and av…