Stricter double-comma replacement

To handle paths ending with commas