Update: simplify comma-spacing logic (fixes #1562)