Tweak the parsing of multiline fields.

I don't think the old parsing was quite right.  In particular it would stick
the single line part of the description onto the beginning of the first line of
the long description part, which is definitely wrong.