Also, don't attach ZWNJ to previous cluster. Closer to Unicode graphemes.
In anticipation of importing more test suites.