Refactor syntax unicode ep constructors2