Fix unicode character parsing and names with {}