Refactor syntax unicode wrappers mc varref