Tidied up uloc.cpp and prepare_arg.cpp