Refinements to validator.