Cleanup wrapping macros