Ensure trailing commas in annotations

Problem/Motivation

Ensure that annotations use trailing commas.

This is a followup to #2707507: Always add trailing commas, for arrays and annotations requested by catch in #18 of that issue.

Steps to reproduce

Proposed resolution

Remaining tasks

User interface changes

API changes

Data model changes