Fix comma logic for joins/parts.