i18n: Couple slight performance tweaks