Remove redundant Locale argument in a bunch of places. Some reformatting.