Overhaul of Localization.
Oops, this was supposed to committed a while ago.