Fix handling of one-liner fields.