{macros/dry,simd/simd_add}: make macros hygienic