Like Dependency, we only were using one of those two fields,
but it was not readily obvious before, and we relied on one
of them being empty to read the other one.