Updated wrap/unwrap logic in data-for bindings.  Closes #56