Made the validator self-validating.