Refactor syntax unicode shims2