Need proper support for unicode combine marks to fix tests; do a more modest implementation for now.
Fix syntax error.