If we're going this route I think the list of fields should be a list of `FieldInfo` objects -- no point in constructing that later.