More work on UpdateFields.