Fixed typo in comment. Fixed a bug that treats a collection field as a scalar one.
Making JSON de/serializer uses wrap for composite values when wrapping is specified (e.g. through @simpl_wrap).