Removed unwrapping of objects in the sorter, as this is no longer necess...

...ary. This also fixes the issue where the sorter returned unwrapped objects