I've seen examples in the code where the whole thing is wrapped.  I will change it, but unsure which one is "right".