Move to Scalaz 7