Attempt to simplyfy validator implementation.