Eliminate PartialDelegatingField (in favor of NestedField).

One test is failing.