Small locale-related optimizations here and there
Merge pull request #39 from mlocati/small-language-optimization

Small locale-related optimizations here and there