catch up to an API change.
refactor validator support logic down into the validator definition
code.  Fix a couple of support mis-matches.