Refactor syntax unicode wrappers