Improved handling of alias locales. Fixes #78