Refactor syntax unicode sort

Depends on refactor-syntax_unicode_datetime_ep