Refactor syntax unicode extras2