Changes to serialization.

John, I made some small changes.  Let's discuss tomorrow.