Simplify handling of trailing commas

Created by  David Tolnay  on October 6, 2019
MMM45Y76ZSMHJ52WZO2CMP6BTNHTJAA54AZRHSIMNZBML7QNBEFQC
Change contents