Unwrap unneeded macros