Refactor syntax unicode navigation