Follow-up r103915: We need to increment $end before the strcspn.