[Serializer] Misc cleanup