Mass-wrapping support added.

Also worked on making the context stuff work more like it's supposed to,
but it's clearly still hosed.