Avoid hard coding marshal header version