A few more serialization tweaks.