Fixed toJSON returning undefined as the elements of a collection.

[odbol]

Not sure if this is a fix, but a workaround for a bigger issue with pseudoIdAttribute.

Also includes an earlier fix from another pull request, but I closed that one as the tests need both fixes to work.