These are now kept while still supporting optional trailing commas and
without introducing pass-through inconsistencies.