Yeah :) There is more that could be done... `ValidatorImpl` is in some kind of messy state with several redundancies.