Fix unswizzling of different objects

Primitives and collection can now be unswizzled as well.