Refactor syntax unicode embedded dispatch