Since we're fixing lots of things here, it's better in a multi-line collection like this to use a trailing comma even on the last item.