Corrected unicode normalizer default to 'NFC'
Brought back some of the deleted code to make things stream safe.