Simplify serialization slightly