Added support for swizzle macro replacement