Refactor syntax unicode dispatch