Update swizzle macros, ref #128