[tz] [PATCH 1/4] Avoid use of local statics