Clean up serialization of month year and year question types