Okay, now I fixed it so that Locale is an enum again.  LocaleNames is
the string constant and might be able to go away.  Only the Service
needs to use the string.