Address code review feedback + weakens "locale" validation.