Remove trailing comma (part 2)

This is starting to become a pain.