Refactor syntax unicode enumeratehandlers