Scalaz upgrade