[PD] comma and escaping revisited