Fix remaining bugs in unicode to str renaming.