Refactor syntax unicode shims5