refactor: Clarify validator relationships
refactor: Clarify validator relationships

We were storing data off into the struct, obscuring the direct
relationship between gathering and validating conflicts.

With this, not as much code needs to deal with mutable data

clap-rs/clap,clap-rs/clap,clap-rs/clap