Continuing to simplify CLDR code.