Update for the new locale lookup stuff.

Properties code still missing, because it is broken.