Move incomplete NFD/NFKD support into a branch