+1 for #3

It's not just in the diffs. Trailing commas make editing the list easier.