Overhaul of Wrapped. (Still some loose ends, including the TH code for
makeWrapped)