Format multiple options on an enum value correctly

@JakeWharton

Options on enum values were not correctly getting commas between fixed, by sharing code with `Option.toString()`
Ew, I hope I didn't write this originally.