More I18n cleanup.