[tz] [PROPOSED 2/2] Simplify timeoff redefinition