src: WIP macroify wrapping instances

Want to make it easy to revert.