Added code to emit trailing ',' for singleton tuples in two places.