Cleanup adding subfields to field (include metadata).