Simplify locale handling