Catch up with the 'errors=bytes' stuff added to the 3.3 pickler.
Fix merge error.