More changes needed to make things work once bytes and str are truly divorced.