Break serialize-env into two files for scm