Moved the last of the enrichments to using Scalaz Validation