shuffle things around to make the unwrappers smaller

this should improve our executable size quite a bit, since generate *a
lot of* unwrappers