Right now some of the call sites assets that ResolvedFieldEntry corresponds to the correct fieldDescriptor, and that these fields are in fact flattened. It was suggested that this would be more robust if this was folded into the construction of the FlatFieldPayload construction.