[tz] [PROPOSED 5/7] Avoid macros in zic.c when easy