This is indeed more palatable, but could you please add a comment saying that we should ideally handle this when we generate the `FieldDescr` list.