Minor serialization tweaks.