Cloud this be merged removed?

If line 145 `self.out.push(',');` could get moved up to the block around line 102, we could avoid this and not have the comma-adding duplication.