#1117 Fix.  Speed boost for validation types.
Signed-off-by:KProvance <kevin.provance@gmail.com>