Remove more comma-adding code.

This is a follow-up to #1461.