ungenerify Validator to simplify Validator implementations

ungenerify Validator to simplify Validator implementations