Refactor syntax unicode shims6