Consolidate the use of the default charset