On second thoughts, I think I shall hold off changing this code and wait for chaley, who wrote it to comment. That code may be the way it is to deal with composite fields that refer to other composite fields.

Agreed - it is minor enough to hold off for more complete analysis.
And if it is that way for a reason, a comment stating the reason would prevent someone else later seeing the same thing and raising the same question later.
-Jesse