Refactor syntax unicode shims3