Handle presence/absence of stray comma