Refactor syntax unicode combining chars fixes