Some adjustments to help implement default field values.