New i18n schema thing impl, and fixed the new tests to match.