Getting rid of more unneeded pickle formats in generated code