Updates emitting containers for structs.  When switched struct wrappers to inherit from atomicreference variable, used a different return_internal_val_from_container.  Changed back to original.