[tz] [PROPOSED 2/5] Improve #if indenting