fix ZKSwizzle macros