More changes from code review.
The extra fields configuration now includes a label which is used when
displaying the info in the UI.