Previously, whenever a XModule was created from a XDescriptor, we created another level of nesting of FieldData objects. This change prevents that nesting. [TKTS-393]
