A couple of minor serialization tweaks.