[TIMOB-11869] Small code cleanup, mostly with i18n stuff.