Refactor syntax unicode shims4