Refactor syntax unicode bugfixes