Refactor syntax unicode shims cmdss