> ValidatorImpl is in some kind of messy state with several redundancies.

+1