I'm not entirely sure these changes are needed or related.  Might be spillover from the unicode literals stuff.