Refactor syntax unicode shims