Changes according to _Tr macro modification.