Some changes in preparation of stricter rules about mixing str and bytes.