Fix up control factory for Unicode changes.
* Not part of unit tests.