Use comma-join where possible