Trailing commas everywhere

Fix #6506.
Fix #7358.