tried to remove some boilerplate in dependency resolution and accidentally may have fixed the "multiple types of sources and/or dependency fields" issue: https://github.com/pantsbuild/pants/pull/10904