Fix array fields.
Tidy.