Model validations refactor

Made the two changes that I commented about in the commits. Although you said not to worry about the second one, it probably makes separating the composite/singular logic, which was something you commented about.

Feel free to just merge the first commit if you don't feel the second one is helpful.

:)