Refactoring to handle the validation, in preperation for greater collection validation.