Standardize more on charset / collation ids than names, since that's what TInstance does. The names are for externalization.
Update tests.