incorporate @andrioni's unicode string normalization fixes