fix dupe/deprecation handling with unicode forms