Small serialization improvements.