Refactor syntax unicode internal build with shims