Stop on comma and EOL, too