Correcting handling of locale default and environment handling to not always append...