Refactor syntax unicode shims1