usp10: Improve handling for ZWJ and ZWNJ in itemization.