Wrap object creation.

This change was one way that we weren't in line with the spec.


/cc @matthewfl