Fix some trivial things in cPickle due to the renaming of the string types.