More fighting with i18n woes.