Changed string parsing slightly.